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

[Commits to the Asterisk SCF project code repositories]

branch "single-api-lib" has been updated
       via  b4fd8d09b52eee7c0cc552b3612b3b4e41a3c3b6 (commit)
      from  9e22fb80604367ec8a4e2a5cb85a65f39476ff9b (commit)

Summary of changes:
 CMakeLists.txt                     |    6 ++----
 client/test/CMakeLists.txt         |    6 ++----
 include/AsteriskSCF/Logger/Level.h |    1 -
 server/src/CMakeLists.txt          |    5 ++---
 server/test/CMakeLists.txt         |    4 ++--
 5 files changed, 8 insertions(+), 14 deletions(-)


- Log -----------------------------------------------------------------
commit b4fd8d09b52eee7c0cc552b3612b3b4e41a3c3b6
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 0fd771d..a3cb69d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,14 +49,12 @@ asterisk_scf_component_add_file(logging-client include/AsteriskSCF/Logger/LogOut
 asterisk_scf_component_add_file(logging-client include/AsteriskSCF/Logger/IceLogger.h)
 asterisk_scf_component_add_file(logging-client include/AsteriskSCF/Logger/Level.h)
 
-asterisk_scf_component_add_slice(logging-client LoggerIf)
-asterisk_scf_component_add_slice(logging-client ServiceLocatorIf)
-asterisk_scf_component_add_slice(logging-client ServiceLocatorEventsIf)
-
 asterisk_scf_component_add_boost_libraries(logging-client thread date_time)
 asterisk_scf_add_ice_libraries(IceStorm)
 
+include_directories(${API_INCLUDE_DIR})
 asterisk_scf_component_build_library(logging-client)
+target_link_libraries(logging-client asterisk-scf-api)
 
 install(TARGETS logging-client
     LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_LIB_DIR}
diff --git a/client/test/CMakeLists.txt b/client/test/CMakeLists.txt
index c5a55fd..57160f2 100644
--- a/client/test/CMakeLists.txt
+++ b/client/test/CMakeLists.txt
@@ -19,18 +19,16 @@ asterisk_scf_component_add_file(logging-client-test client-test.cpp)
 
 asterisk_scf_component_add_boost_libraries(logging-client-test unit_test_framework)
 
-asterisk_scf_component_add_slice(logging-client-test LoggerIf)
-asterisk_scf_component_add_slice(logging-client-test ServiceLocatorIf)
-
+include_directories(${API_INCLUDE_DIR})
 asterisk_scf_component_build_standalone(logging-client-test)
 target_link_libraries(logging-client-test logging-client)
+target_link_libraries(logging-client-test asterisk-scf-api)
 
 boost_add_test(logging-client-test)
 
 asterisk_scf_component_init(scf-log CXX)
 
 asterisk_scf_component_add_file(scf-log scf-log.cpp)
-asterisk_scf_component_add_slice(scf-log LoggerIf)
 
 asterisk_scf_component_add_boost_libraries(scf-log program_options)
 
diff --git a/include/AsteriskSCF/Logger/Level.h b/include/AsteriskSCF/Logger/Level.h
index 0ebcf8a..8c4353a 100644
--- a/include/AsteriskSCF/Logger/Level.h
+++ b/include/AsteriskSCF/Logger/Level.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include <ostream>
-
 #include <AsteriskSCF/System/Logger/LoggerIf.h>
 
 namespace AsteriskSCF
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index f43a45e..741a2cb 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -10,9 +10,6 @@ asterisk_scf_component_init(logging-service CXX)
 
 include_directories(../../include)
 
-asterisk_scf_component_add_slice(logging-service LoggerIf)
-asterisk_scf_component_add_slice(logging-service ServiceLocatorIf)
-
 asterisk_scf_component_add_file(logging-service ChainedLogOut.cpp)
 asterisk_scf_component_add_file(logging-service FileChainedLogOut.cpp)
 asterisk_scf_component_add_file(logging-service LoggingServer.cpp)
@@ -27,7 +24,9 @@ asterisk_scf_component_add_file(logging-service LoggingServer.h)
 asterisk_scf_add_ice_libraries(IceStorm)
 asterisk_scf_component_add_boost_libraries(logging-service core)
 
+include_directories(${API_INCLUDE_DIR})
 asterisk_scf_component_build_icebox(logging-service)
+target_link_libraries(logging-service asterisk-scf-api)
 
 install(TARGETS logging-service
     LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR}
diff --git a/server/test/CMakeLists.txt b/server/test/CMakeLists.txt
index a7e99e9..86e4a80 100644
--- a/server/test/CMakeLists.txt
+++ b/server/test/CMakeLists.txt
@@ -11,14 +11,14 @@ asterisk_scf_component_init(logging-service-test CXX)
 include_directories(../src)
 include_directories(../../include)
 
-asterisk_scf_component_add_slice(logging-service-test LoggerIf)
-
 asterisk_scf_component_add_file(logging-service-test LoggingServer-test.cpp)
 asterisk_scf_component_add_file(logging-service-test server-test.cpp)
 
 asterisk_scf_component_add_boost_libraries(logging-service-test unit_test_framework)
 
+include_directories(${API_INCLUDE_DIR})
 asterisk_scf_component_build_standalone(logging-service-test)
+target_link_libraries(logging-service-test asterisk-scf-api)
 
 target_link_libraries(logging-service-test logging-service)
 

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


-- 
asterisk-scf/integration/logger.git