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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  7a581b9c43a91428b9f937509b06ea7cdc9aa31a (commit)
      from  0584204733e9b75b4e93fbc505d525f3855c2ba9 (commit)

Summary of changes:
 src/CMakeLists.txt  |    8 ++------
 test/CMakeLists.txt |   28 ++++++++++------------------
 2 files changed, 12 insertions(+), 24 deletions(-)


- Log -----------------------------------------------------------------
commit 7a581b9c43a91428b9f937509b06ea7cdc9aa31a
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Wed Jun 1 16:56:54 2011 -0500

    More CMake script cleanup, and ensure bridge_unit_tests gets run.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f12a0f0..f2c83c3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,6 @@
-if(NOT logger_dir)
-  message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
-endif()
-include_directories(${logger_dir}/include)
 include_directories(${API_INCLUDE_DIR})
-include_directories(${utils_dir}/include)
+include_directories(${logger_dir}/include)
+include_directories(${ice-util-cpp_dir}/include)
 
 asterisk_scf_slice_include_directories(${API_SLICE_DIR})
 
@@ -44,7 +41,6 @@ target_link_libraries(bridgeservice logging-client)
 asterisk_scf_component_install(bridgeservice)
 
 asterisk_scf_component_init(BridgeReplicator)
-include_directories(${utils_dir}/StateReplicator/include)
 asterisk_scf_component_add_file(BridgeReplicator BridgeReplicatorService.cpp)
 asterisk_scf_component_add_slice(BridgeReplicator ./BridgeReplicatorIf.ice)
 asterisk_scf_component_add_ice_libraries(BridgeReplicator IceStorm)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b577e6e..b06bf75 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,17 +1,12 @@
+include_directories(${API_INCLUDE_DIR})
+include_directories(${logger_dir}/include)
+include_directories(${ice-util-cpp_dir}/include)
+
 asterisk_scf_slice_include_directories(${API_SLICE_DIR})
-if(NOT integrated_build STREQUAL "true")
-  add_subdirectory(channel_driver/local_slice)
-endif()
+
 include_directories("../src")
-include_directories(${utils_dir}/include)
-if(NOT logger_dir)
-  message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
-endif()
-include_directories(${logger_dir}/include)
-include_directories(${API_INCLUDE_DIR})
-if(integrated_build STREQUAL "true")
-  include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../test_channel/local_slice/generated)
-endif()
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../test_channel/local_slice/generated)
 
 asterisk_scf_component_init(bridge_component_test)
 asterisk_scf_component_add_slice(bridge_component_test CommandsIf)
@@ -30,11 +25,7 @@ asterisk_scf_component_build_icebox(bridge_component_test)
 target_link_libraries(bridge_component_test logging-client)
 target_link_libraries(bridge_component_test asterisk-scf-api)
 target_link_libraries(bridge_component_test test-channel-api)
-
-# component tests only work for integrated builds
-if(integrated_build STREQUAL "true")
-  asterisk_scf_test_icebox(bridge_component_test config/test_bridging.conf)
-endif()
+asterisk_scf_test_icebox(bridge_component_test config/test_bridging.conf)
 
 asterisk_scf_component_init(bridge_unit_tests)
 asterisk_scf_component_add_slice(bridge_unit_tests ../src/BridgeReplicatorIf.ice)
@@ -43,8 +34,9 @@ asterisk_scf_component_add_file(bridge_unit_tests ../src/SessionOperations.cpp)
 asterisk_scf_component_add_file(bridge_unit_tests ../src/SessionWrapper.cpp)
 asterisk_scf_component_add_file(bridge_unit_tests ../src/MediaSplicer.cpp)
 asterisk_scf_component_add_file(bridge_unit_tests UnitTests.cpp)
-asterisk_scf_component_add_ice_libraries(bridge_component_test Ice)
+asterisk_scf_component_add_ice_libraries(bridge_unit_tests Ice)
 asterisk_scf_component_add_boost_libraries(bridge_unit_tests unit_test_framework thread)
 asterisk_scf_component_build_standalone(bridge_unit_tests)
 target_link_libraries(bridge_unit_tests logging-client)
 target_link_libraries(bridge_unit_tests asterisk-scf-api)
+asterisk_scf_test_boost(bridge_unit_tests)

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


-- 
asterisk-scf/release/bridging.git