[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  50af0d1d84473b946a414371721b4238d3edd4c6 (commit)
      from  f5dcb73aa6740cbfdcd9acf67dee0749d7591b0a (commit)

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


- Log -----------------------------------------------------------------
commit 50af0d1d84473b946a414371721b4238d3edd4c6
Author: David M. Lee <dlee at digium.com>
Date:   Wed Jan 12 19:06:34 2011 -0600

    Building a single API library.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2e42923..9bf71fc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,4 @@
 asterisk_scf_component_init(bridgeservice CXX)
-asterisk_scf_component_add_slice(bridgeservice EndpointIf)
-asterisk_scf_component_add_slice(bridgeservice ComponentServiceIf)
-asterisk_scf_component_add_slice(bridgeservice SessionCommunicationsIf)
-asterisk_scf_component_add_slice(bridgeservice ServiceLocatorIf)
 asterisk_scf_component_add_file(bridgeservice Service.cpp)
 asterisk_scf_component_add_file(bridgeservice BridgeImpl.h)
 asterisk_scf_component_add_file(bridgeservice BridgeImpl.cpp)
@@ -22,6 +18,8 @@ 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})
 
 asterisk_scf_component_build_icebox(bridgeservice)
 target_link_libraries(bridgeservice logging-client)
+target_link_libraries(bridgeservice asterisk-scf-api)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 22bba34..4c33c27 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,10 +3,6 @@ if(NOT integrated_build STREQUAL "true")
 endif()
 asterisk_scf_component_init(bridging_unit_test CXX)
 include_directories("../src")
-asterisk_scf_component_add_slice(bridging_unit_test EndpointIf)
-asterisk_scf_component_add_slice(bridging_unit_test ComponentServiceIf)
-asterisk_scf_component_add_slice(bridging_unit_test SessionCommunicationsIf)
-asterisk_scf_component_add_slice(bridging_unit_test CommandsIf)
 asterisk_scf_component_add_file(bridging_unit_test TestBridging.cpp)
 asterisk_scf_component_add_file(bridging_unit_test SessionListenerI.h)
 asterisk_scf_component_add_file(bridging_unit_test SessionListenerI.cpp)
@@ -24,9 +20,13 @@ 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(${TEST_CHANNEL_API_INCLUDE_DIR})
 
 asterisk_scf_component_build_icebox(bridging_unit_test)
 target_link_libraries(bridging_unit_test logging-client)
+target_link_libraries(bridging_unit_test asterisk-scf-api)
+target_link_libraries(bridging_unit_test test-channel-api)
 
 # component tests only work for integrated builds
 if(integrated_build STREQUAL "true")

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


-- 
asterisk-scf/release/bridging.git