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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  279a390c88364bfe694abd1feeb01003ee4226d0 (commit)
      from  6f7bcf618f587e939743eb987af205bb5d114835 (commit)

Summary of changes:
 CMakeLists.txt |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit 279a390c88364bfe694abd1feeb01003ee4226d0
Author: David M. Lee <dlee at digium.com>
Date:   Thu Oct 7 17:39:18 2010 -0500

    Set a test_channel_bindir to make the libs findable.
    Adjusted for integrated build.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81b6be8..b76275e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,16 +1,21 @@
-# Service locator build system
+# Test channel
 
-# 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/AsteriskSCF.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("Test Channel" 3.4 CXX)
+  # Include common Hydra build infrastructure
+  include(cmake/AsteriskSCF.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("Test Channel" 3.4 CXX)
+
+  # Take care of slice definitions
+  add_subdirectory(slice EXCLUDE_FROM_ALL)
+else()
+  set(test_channel_bindir ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
+endif()
 
 add_subdirectory(local_slice)
 add_subdirectory(src)

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


-- 
asterisk-scf/integration/test_channel.git