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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  9e78ca5841e4d6f85683f0544e89159afb4eeb75 (commit)
      from  7a7738eb6d8e69b9e2d4d0b26854d94d651b91e8 (commit)

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


- Log -----------------------------------------------------------------
commit 9e78ca5841e4d6f85683f0544e89159afb4eeb75
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 534deef..70a39e5
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,16 +1,28 @@
+#
+# Asterisk Scalable Communications Framework
+#
+# Copyright (C) 2010 -- Digium, Inc.
+#
+# All rights reserved.
+#
+
 # Bridging 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")
+
+   # 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 common Hydra build infrastructure
-include(cmake/Hydra_v4.cmake)
+   # This project is C++ based and requires a minimum of 3.4
+   hydra_project("bridging service" 3.4 CXX)
 
-# This project is C++ based and requires a minimum of 3.4
-hydra_project("bridging service" 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/bridging.git