[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  b1a2cf3110dc9e0d397931af9c6169eee33ebe4d (commit)
       via  509b8256e8359e227a83c6b3afd25348e1c7d532 (commit)
      from  95463f62b2aa228f58b4583016833bbd3b5a2cc9 (commit)

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


- Log -----------------------------------------------------------------
commit b1a2cf3110dc9e0d397931af9c6169eee33ebe4d
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 a8c756f..a46eead 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})
 install(DIRECTORY include/ DESTINATION ${ASTERISK_SCF_INSTALL_INCLUDE_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 ecd1605..6b896db 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,8 +24,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 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)
 

commit 509b8256e8359e227a83c6b3afd25348e1c7d532
Author: David M. Lee <dlee at digium.com>
Date:   Mon Jan 10 14:03:45 2011 -0600

    Install

diff --git a/CMakeLists.txt b/CMakeLists.txt
index edd81ec..a8c756f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,3 +57,6 @@ asterisk_scf_component_add_boost_libraries(logging-client thread date_time)
 asterisk_scf_add_ice_libraries(IceStorm)
 
 asterisk_scf_component_build_library(logging-client)
+
+install(TARGETS logging-client LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_LIB_DIR})
+install(DIRECTORY include/ DESTINATION ${ASTERISK_SCF_INSTALL_INCLUDE_DIR})
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index 0826d82..ecd1605 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -29,4 +29,6 @@ asterisk_scf_component_add_boost_libraries(logging-service core)
 
 asterisk_scf_component_build_icebox(logging-service)
 
+install(TARGETS logging-service LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR})
+
 #asterisk_scf_component_install(logging-service RUNTIME bin "Logging Service" System)

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


-- 
asterisk-scf/release/logger.git