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

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Wed Apr 27 13:55:22 CDT 2011


branch "master" has been updated
       via  b1e597199f1da4db167f3b4bfa6edf06945ff1f0 (commit)
      from  5f5cd35c9c79d6b8df09b9507ab0f42e4a587c9c (commit)

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


- Log -----------------------------------------------------------------
commit b1e597199f1da4db167f3b4bfa6edf06945ff1f0
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Wed Apr 27 13:55:19 2011 -0500

    Add Ice libraries to specific components, not to all components in the same directory.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f77429c..73e4990 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ 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_boost_libraries(logging-client thread date_time)
-asterisk_scf_add_ice_libraries(IceStorm)
+asterisk_scf_component_add_ice_libraries(logging-client IceStorm)
 asterisk_scf_component_build_library(logging-client)
 target_link_libraries(logging-client asterisk-scf-api)
 asterisk_scf_component_install(logging-client)
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index a77849d..6cb3451 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -3,8 +3,6 @@ include_directories(${API_INCLUDE_DIR})
 
 asterisk_scf_slice_include_directories(${API_SLICE_DIR})
 
-asterisk_scf_add_ice_libraries(IceStorm)
-
 asterisk_scf_component_init(logging-service-lib CXX)
 # an icebox module cannot be used as a shared lib.  so build the bulk of the
 # code as a static lib that can be linked into both the icebox module and
@@ -22,6 +20,7 @@ asterisk_scf_component_add_file(logging-service-lib LoggingServer.h)
 asterisk_scf_component_add_file(logging-service-lib Configuration.h)
 asterisk_scf_component_add_slice(logging-service-lib ../local-slice/LoggingConfigurationIf.ice)
 asterisk_scf_component_add_boost_libraries(logging-service-lib core)
+asterisk_scf_component_add_ice_libraries(logging-service-lib IceStorm)
 asterisk_scf_component_build_library(logging-service-lib)
 target_link_libraries(logging-service-lib asterisk-scf-api)
 

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


-- 
asterisk-scf/release/logger.git



More information about the asterisk-scf-commits mailing list