[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  0b6fc078a74a8cdc36ce3be557f1a088352afd4d (commit)
       via  8fc94ed635fb444b2e80c883db007610017c7736 (commit)
      from  547b8f12a97e5272edd4d25f064d4c8def3ec148 (commit)

Summary of changes:
 CMakeLists.txt   |   12 +++++-------
 CMakeSubDirs.txt |    8 ++++++++
 2 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 CMakeSubDirs.txt


- Log -----------------------------------------------------------------
commit 0b6fc078a74a8cdc36ce3be557f1a088352afd4d
Merge: 8fc94ed 547b8f1
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Aug 26 14:06:37 2010 -0500

    Merge branch 'master' of git.asterisk.org:asterisk-scf/integration/sip


commit 8fc94ed635fb444b2e80c883db007610017c7736
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Aug 26 14:06:13 2010 -0500

    CMake mods to support integrated build.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d74d9b..db32a4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,17 +9,15 @@ 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)
 
-# We depend on pjsip, so this needs to be taken care of. 
+# Include pjproject build integration
 include(cmake/modules/pjproject.cmake)
 pjproject_build(pjlib)
 pjproject_build(pjsip)
 
 # Pull in the slice definitions
 add_subdirectory(slice)
-add_subdirectory(local-slice)
 
-# Add our component's source code 
-add_subdirectory(src)
-
-# Pull in the test suite
-add_subdirectory(test)
+# Include the subdirectory information. This is separate so that
+# a higher-level CMakeLists.txt can act as a master for integrated
+# builds.
+include(CMakeSubDirs.txt)
diff --git a/CMakeSubDirs.txt b/CMakeSubDirs.txt
new file mode 100644
index 0000000..6ad9e82
--- /dev/null
+++ b/CMakeSubDirs.txt
@@ -0,0 +1,8 @@
+
+add_subdirectory(local-slice)
+
+# Add our component's source code 
+add_subdirectory(src)
+
+# Pull in the test suite
+add_subdirectory(test)
\ No newline at end of file

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


-- 
asterisk-scf/integration/sip.git