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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  e21294d36cf83676af9cf8c556cc69d885cb840c (commit)
      from  445bf6f66805ad4ba1ec0cf1983fa96931c56356 (commit)

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


- Log -----------------------------------------------------------------
commit e21294d36cf83676af9cf8c556cc69d885cb840c
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 16acc68..260911f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,9 +9,6 @@
 # Create the actual standalone service locator component
 asterisk_scf_component_init(service_locator CXX)
 
-asterisk_scf_component_add_slice(service_locator ServiceLocatorIf)
-asterisk_scf_component_add_slice(service_locator ServiceLocatorEventsIf)
-
 asterisk_scf_component_add_file(service_locator ServiceLocator.cpp)
 asterisk_scf_component_add_file(service_locator ServiceLocatorManagement.cpp)
 asterisk_scf_component_add_file(service_locator ServiceManagement.cpp)
@@ -29,6 +26,7 @@ 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(service_locator)
 target_link_libraries(service_locator logging-client)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2642a51..3fc98bd 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -8,15 +8,15 @@
 
 # Create the actual standalone service locator test driver component
 asterisk_scf_component_init(service_locator_test CXX)
-asterisk_scf_component_add_slice(service_locator_test ServiceLocatorIf)
-asterisk_scf_component_add_slice(service_locator_test ServiceLocatorEventsIf)
 asterisk_scf_component_add_file(service_locator_test TestServiceLocator.cpp)
 asterisk_scf_component_add_file(service_locator_test TestComparatorBlocking.cpp)
 asterisk_scf_component_add_ice_libraries(service_locator_test IceStorm)
 asterisk_scf_component_add_boost_libraries(service_locator_test
     unit_test_framework thread date_time)
+
+include_directories(${API_INCLUDE_DIR})
 asterisk_scf_component_build_icebox(service_locator_test)
-#asterisk_scf_component_install(service_locator_test RUNTIME bin "Service Locator Test Driver." Core)
+target_link_libraries(service_locator_test asterisk-scf-api)
 
 icebox_add_test(service_locator_test config/test_component.config)
 

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


-- 
asterisk-scf/release/servicediscovery.git