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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  db071ec80ad9e9901ad7c548d475edbf70f70667 (commit)
      from  d73762f3cc7eb13b5441a37e889cead9064d0888 (commit)

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


- Log -----------------------------------------------------------------
commit db071ec80ad9e9901ad7c548d475edbf70f70667
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Aug 26 14:10:54 2010 -0500

    CMake mods to support intergrated build.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8abe2c..4c6c930 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,12 +3,12 @@
 # Minimum we require is 2.6, any lower and stuff would fail horribly
 cmake_minimum_required(VERSION 2.6)
 
-# Include common Hydra build infrastructure
-include(cmake/Hydra_v4.cmake)
-
 # Include pjproject build integration
 include(cmake/modules/pjproject.cmake)
 
+# Include common Hydra build infrastructure
+include(cmake/Hydra_v4.cmake)
+
 # Add build targets for what we will need to link against
 pjproject_build(pjlib)
 pjproject_build(pjlib-util)
@@ -21,8 +21,8 @@ hydra_project(media_rtp_pjmedia 3.4 CXX)
 # Knock out slice definitions
 add_subdirectory(slice EXCLUDE_FROM_ALL)
 
-# Take care of the source code for this project
-add_subdirectory(src)
+# 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)
 
-# Finally take care of the test suite
-add_subdirectory(test)
diff --git a/CMakeSubDirs.txt b/CMakeSubDirs.txt
new file mode 100644
index 0000000..f7c3595
--- /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)

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


-- 
asterisk-scf/integration/media_rtp_pjmedia.git