[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  599fbbc4a5a73ecc1bead0f16156b520d16af515 (commit)
      from  6dde7d565771b3c1f4a5f4b9a2d0bc7977b3e3ba (commit)

Summary of changes:
 CMakeLists.txt |   44 ++++++++++++++++++++++++++++----------------
 1 files changed, 28 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 CMakeLists.txt


- Log -----------------------------------------------------------------
commit 599fbbc4a5a73ecc1bead0f16156b520d16af515
Author: David M. Lee <dlee at digium.com>
Date:   Tue Sep 14 00:17:27 2010 -0500

    Simplify integrated build.  Instead of lots of special cases and file
    copying, we now just have an 'integrated' variable we can test to see
    if we're in an integrated build or not.

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100644
new mode 100755
index d699ff4..39c5e0e
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,25 +1,37 @@
+#
+# Asterisk Scalable Communications Framework
+#
+# Copyright (C) 2010 -- Digium, Inc.
+#
+# All rights reserved.
+#
+
 # SIP Channel Service build system
 
-# Minimum we require is 2.6
-cmake_minimum_required(VERSION 2.6)
+if(NOT integrated_build STREQUAL "true")
+
+   # Minimum we require is 2.6
+   cmake_minimum_required(VERSION 2.6)
+
+   # Include common Hydra build infrastructure. Make sure your submodules are pulled. 
+   include(cmake/Hydra_v4.cmake)
 
-# Include common Hydra build infrastructure. Make sure your submodules are pulled. 
-include(cmake/Hydra_v4.cmake)
+   # This project is C++ based and requires a minimum of 3.4 of Ice. 
+   hydra_project(SipChannelService 3.4 CXX)
 
-# This project is C++ based and requires a minimum of 3.4 of Ice. 
-hydra_project(SipChannelService 3.4 CXX)
+   # Include pjproject build integration
+   include(cmake/modules/pjproject.cmake)
+   pjproject_build(pjlib)
+   pjproject_build(pjlib-util)
+   pjproject_build(pjnath)
+   pjproject_build(pjmedia)
+   pjproject_build(pjsip)
+   pjproject_build(third_party)
 
-# Include pjproject build integration
-include(cmake/modules/pjproject.cmake)
-pjproject_build(pjlib)
-pjproject_build(pjlib-util)
-pjproject_build(pjnath)
-pjproject_build(pjmedia)
-pjproject_build(pjsip)
-pjproject_build(third_party)
+   # Pull in the slice definitions
+   add_subdirectory(slice)
 
-# Pull in the slice definitions
-add_subdirectory(slice)
+endif()
 
 # Include the subdirectory information. This is separate so that
 # a higher-level CMakeLists.txt can act as a master for integrated

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/sip.git