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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  a7047fab3b36ecdd12b21aa95e58b8dc29d2756d (commit)
      from  3e2c95cb9cd139d766ffbf9ee6bd7dc9dd043458 (commit)

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


- Log -----------------------------------------------------------------
commit a7047fab3b36ecdd12b21aa95e58b8dc29d2756d
Author: David M. Lee <dlee at digium.com>
Date:   Tue Sep 14 00:17:26 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 eb1afaf..efb08bb
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,16 +1,28 @@
+#
+# Asterisk Scalable Communications Framework
+#
+# Copyright (C) 2010 -- Digium, Inc.
+#
+# All rights reserved.
+#
+
 # Routing 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(RoutingService 3.4 CXX)
 
-# This project is C++ based and requires a minimum of 3.4 of Ice. 
-hydra_project(RoutingService 3.4 CXX)
+   # Take care of slice definitions
+   add_subdirectory(slice)
 
-# Take care of 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/routing.git