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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  ed83ebf85a0a6e3c258377d920c19a298829d92c (commit)
      from  a3ca6df65b53dcc23316511d12d4b52ca3ebcac0 (commit)

Summary of changes:
 CMakeLists.txt   |    9 ++++-----
 CMakeSubDirs.txt |    7 +++++++
 2 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 CMakeSubDirs.txt


- Log -----------------------------------------------------------------
commit ed83ebf85a0a6e3c258377d920c19a298829d92c
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Aug 26 14:03:07 2010 -0500

    CMake mods to support integrated build

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9cbf688..c2d665f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,8 +12,7 @@ hydra_project(service_locator 3.4 CXX)
 # Take care of slice definitions
 add_subdirectory(slice EXCLUDE_FROM_ALL)
 
-# Take care of the source code for this project
-add_subdirectory(src)
-
-# Finally take care of 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)
\ No newline at end of file
diff --git a/CMakeSubDirs.txt b/CMakeSubDirs.txt
new file mode 100644
index 0000000..632bec7
--- /dev/null
+++ b/CMakeSubDirs.txt
@@ -0,0 +1,7 @@
+
+
+# Take care of the source code for this project
+add_subdirectory(src)
+
+# Finally take care of the test suite
+add_subdirectory(test)
\ No newline at end of file

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


-- 
asterisk-scf/integration/servicediscovery.git