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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  235472332766f44b7db41e9c589e9ab02603a912 (commit)
      from  b1a2cf3110dc9e0d397931af9c6169eee33ebe4d (commit)

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


- Log -----------------------------------------------------------------
commit 235472332766f44b7db41e9c589e9ab02603a912
Author: David M. Lee <dlee at digium.com>
Date:   Thu Jan 13 00:11:20 2011 -0600

    Revert "Building a single API library."
    
    This reverts commit b1a2cf3110dc9e0d397931af9c6169eee33ebe4d.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a46eead..a8c756f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,12 +49,14 @@ 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})
 install(DIRECTORY include/ DESTINATION ${ASTERISK_SCF_INSTALL_INCLUDE_DIR})
diff --git a/client/test/CMakeLists.txt b/client/test/CMakeLists.txt
index 57160f2..c5a55fd 100644
--- a/client/test/CMakeLists.txt
+++ b/client/test/CMakeLists.txt
@@ -19,16 +19,18 @@ asterisk_scf_component_add_file(logging-client-test client-test.cpp)
 
 asterisk_scf_component_add_boost_libraries(logging-client-test unit_test_framework)
 
-include_directories(${API_INCLUDE_DIR})
+asterisk_scf_component_add_slice(logging-client-test LoggerIf)
+asterisk_scf_component_add_slice(logging-client-test ServiceLocatorIf)
+
 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 8c4353a..0ebcf8a 100644
--- a/include/AsteriskSCF/Logger/Level.h
+++ b/include/AsteriskSCF/Logger/Level.h
@@ -9,6 +9,7 @@
 #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 6b896db..ecd1605 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -10,6 +10,9 @@ 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)
@@ -24,8 +27,8 @@ 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})
+
+#asterisk_scf_component_install(logging-service RUNTIME bin "Logging Service" System)
diff --git a/server/test/CMakeLists.txt b/server/test/CMakeLists.txt
index 86e4a80..a7e99e9 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/release/logger.git