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

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Tue Apr 26 13:38:54 CDT 2011


branch "master" has been updated
       via  7b3b4739995997119cb190eae940de948bfb1075 (commit)
      from  eee61313875db02d8159c74d426bb64a406d9d6b (commit)

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


- Log -----------------------------------------------------------------
commit 7b3b4739995997119cb190eae940de948bfb1075
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Mon Apr 25 17:45:43 2011 -0500

    Changes to work with new single-build-directory CMake script.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fe01ac..6f67a90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,22 +1,17 @@
 # Test channel
 
 if(NOT integrated_build STREQUAL "true")
-
   # Minimum we require is 2.8, any lower and stuff would fail horribly
   cmake_minimum_required(VERSION 2.8)
 
   # Include common AsteriskSCF build infrastructure
   include(cmake/AsteriskSCF.cmake)
-
-  # This project is C++ based and requires a minimum of 3.4
-  asterisk_scf_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()
 
+asterisk_scf_project("Test Channel" 3.4)
+
 add_subdirectory(local_slice)
 add_subdirectory(src)
 

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


-- 
asterisk-scf/release/test_channel.git



More information about the asterisk-scf-commits mailing list