[asterisk-scf-commits] asterisk-scf/integration/test_channel.git branch "single-api-lib" updated.

[Commits to the Asterisk SCF project code repositories]

branch "single-api-lib" has been updated
       via  c58affd9d4f15ac511c40a461ef1708382778aaa (commit)
      from  b3f41ed61d129016b88180536ad967adacade764 (commit)

Summary of changes:
 CMakeLists.txt             |    1 +
 local_slice/CMakeLists.txt |   18 +++++++++++++++++-
 src/CMakeLists.txt         |   15 ++++++++-------
 3 files changed, 26 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit c58affd9d4f15ac511c40a461ef1708382778aaa
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/CMakeLists.txt b/CMakeLists.txt
index 6b032c3..b0b3d8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,3 +20,4 @@ endif()
 add_subdirectory(local_slice)
 add_subdirectory(src)
 
+set(TEST_CHANNEL_API_INCLUDE_DIR ${TEST_CHANNEL_API_INCLUDE_DIR} PARENT_SCOPE)
diff --git a/local_slice/CMakeLists.txt b/local_slice/CMakeLists.txt
index a1ed80b..95c6e7d 100644
--- a/local_slice/CMakeLists.txt
+++ b/local_slice/CMakeLists.txt
@@ -1 +1,17 @@
-asterisk_scf_compile_slice(CommandsIf.ice lib "Test Channel Command API" TestChannel)
+#
+# Asterisk Scalable Communications Framework
+#
+# Copyright (C) 2010 -- Digium, Inc.
+#
+# All rights reserved.
+#
+
+asterisk_scf_component_init(test-channel-api CXX)
+
+asterisk_scf_component_add_slice(test-channel-api CommandsIf.ice)
+
+asterisk_scf_add_ice_libraries(Ice IceUtil)
+asterisk_scf_component_build_library(test-channel-api)
+
+set(TEST_CHANNEL_API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 33d3155..04cd2e7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,4 @@
 asterisk_scf_component_init(test_channel CXX)
-asterisk_scf_component_add_slice(test_channel EndpointIf)
-asterisk_scf_component_add_slice(test_channel ComponentServiceIf)
-asterisk_scf_component_add_slice(test_channel SessionCommunicationsIf)
-asterisk_scf_component_add_slice(test_channel RoutingIf)
-asterisk_scf_component_add_slice(test_channel CommandsIf)
 asterisk_scf_component_add_file(test_channel Service.cpp)
 asterisk_scf_component_add_file(test_channel MediaEchoThread.cpp)
 asterisk_scf_component_add_file(test_channel MediaSession.cpp)
@@ -12,12 +7,18 @@ asterisk_scf_component_add_file(test_channel TestEndpoint.h)
 asterisk_scf_component_add_ice_libraries(test_channel IceStorm)
 asterisk_scf_component_add_boost_libraries(test_channel thread)
 asterisk_scf_component_add_boost_libraries(test_channel date_time)
+
+include_directories(${API_INCLUDE_DIR})
+include_directories(${TEST_CHANNEL_API_INCLUDE_DIR})
 asterisk_scf_component_build_icebox(test_channel)
+target_link_libraries(test_channel asterisk-scf-api)
+target_link_libraries(test_channel test-channel-api)
 
 asterisk_scf_component_init(console_driver CXX)
-asterisk_scf_component_add_slice(console_driver CommandsIf)
 asterisk_scf_component_add_file(console_driver ConsoleDriver.cpp)
 asterisk_scf_component_add_file(console_driver ConsoleDriver.h)
 asterisk_scf_component_add_file(console_driver main.cpp)
-asterisk_scf_component_build_standalone(console_driver)
 
+include_directories(${TEST_CHANNEL_API_INCLUDE_DIR})
+asterisk_scf_component_build_standalone(console_driver)
+target_link_libraries(console_driver test-channel-api)

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


-- 
asterisk-scf/integration/test_channel.git