[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  05dfc6c06742807c76e16a5a5ad02a555104235b (commit)
      from  21056247f2b8e458fd992aff52c02846d4161969 (commit)

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


- Log -----------------------------------------------------------------
commit 05dfc6c06742807c76e16a5a5ad02a555104235b
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 3060ffb..8361016
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,19 +8,23 @@
 
 # Service locator build system
 
-# Minimum we require is 2.6, any lower and stuff would fail horribly
-cmake_minimum_required(VERSION 2.6)
+if(NOT integrated_build STREQUAL "true")
 
-# Include common Hydra build infrastructure
-include(cmake/Hydra_v4.cmake)
+   # Minimum we require is 2.6, any lower and stuff would fail horribly
+   cmake_minimum_required(VERSION 2.6)
 
-# This project is C++ based and requires a minimum of 3.4
-hydra_project(service_locator 3.4 CXX)
+   # Include common Hydra build infrastructure
+   include(cmake/Hydra_v4.cmake)
 
-# Take care of slice definitions
-add_subdirectory(slice EXCLUDE_FROM_ALL)
+   # This project is C++ based and requires a minimum of 3.4
+   hydra_project(service_locator 3.4 CXX)
+
+   # Take care of slice definitions
+   add_subdirectory(slice EXCLUDE_FROM_ALL)
+
+endif()
 
 # 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
+include(CMakeSubDirs.txt)

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


-- 
asterisk-scf/integration/servicediscovery.git