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

[Commits to the Asterisk SCF project code repositories]

branch "single-api-lib" has been updated
       via  be9168f36d9785259a56fa6781b1f9698e70feef (commit)
      from  4412b56c2b6c9c7c0a8e67674e4b25fa62126cc8 (commit)

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


- Log -----------------------------------------------------------------
commit be9168f36d9785259a56fa6781b1f9698e70feef
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 cc8fe61..cc0e94d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,11 +2,6 @@
 asterisk_scf_component_init(BasicRoutingService CXX)
 find_package(Lua51 REQUIRED)
 include_directories(${LUA_INCLUDE_DIR})
-asterisk_scf_component_add_slice(BasicRoutingService RoutingIf)
-asterisk_scf_component_add_slice(BasicRoutingService ServiceLocatorIf)
-asterisk_scf_component_add_slice(BasicRoutingService EndpointIf)
-asterisk_scf_component_add_slice(BasicRoutingService SessionCommunicationsIf)
-asterisk_scf_component_add_slice(BasicRoutingService ComponentServiceIf)
 asterisk_scf_component_add_file(BasicRoutingService BasicRoutingServiceApp.cpp)
 asterisk_scf_component_add_file(BasicRoutingService SessionRouter.cpp)
 asterisk_scf_component_add_file(BasicRoutingService SessionRouter.h)
@@ -27,11 +22,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(${utils_dir}/SmartProxy/include)
 
 asterisk_scf_component_build_icebox(BasicRoutingService)
 target_link_libraries(BasicRoutingService ${LUA_LIBRARIES})
 target_link_libraries(BasicRoutingService logging-client)
+target_link_libraries(BasicRoutingService asterisk-scf-api)
 
 #asterisk_scf_component_install(BasicRoutingService RUNTIME bin "Basic Routing Service" Core)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fca99ba..c2935e1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,8 +1,5 @@
 # Create Basic Routing Service test project.
 asterisk_scf_component_init(RoutingTest CXX)
-asterisk_scf_component_add_slice(RoutingTest RoutingIf)
-asterisk_scf_component_add_slice(RoutingTest ServiceLocatorIf)
-asterisk_scf_component_add_slice(RoutingTest SessionCommunicationsIf)
 
 asterisk_scf_component_add_file(RoutingTest TestRouting.cpp)
 asterisk_scf_component_add_file(RoutingTest SharedTestData.h)
@@ -19,7 +16,9 @@ asterisk_scf_component_add_file(RoutingTest MockEndpointLocator.cpp)
 
 asterisk_scf_component_add_ice_libraries(RoutingTest IceStorm)
 asterisk_scf_component_add_boost_libraries(RoutingTest unit_test_framework)
+include_directories(${API_INCLUDE_DIR})
 asterisk_scf_component_build_icebox(RoutingTest)
+target_link_libraries(RoutingTest asterisk-scf-api)
 
 if(integrated_build STREQUAL "true")
    icebox_add_test(RoutingTest ../config/routingtest-integ.config)

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


-- 
asterisk-scf/integration/routing.git