[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  b65f114294c2d79c7c8b455df77f7ad40c70e213 (commit)
      from  c2c52a84376b44740f9be2579a88160838303525 (commit)

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


- Log -----------------------------------------------------------------
commit b65f114294c2d79c7c8b455df77f7ad40c70e213
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Fri Dec 3 13:27:59 2010 -0600

    Manage boost link options in CMake.

diff --git a/client/src/CMakeLists.txt b/client/src/CMakeLists.txt
index 74675bd..ba73028 100644
--- a/client/src/CMakeLists.txt
+++ b/client/src/CMakeLists.txt
@@ -24,7 +24,7 @@ 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_add_boost_libraries(thread)
+asterisk_scf_component_add_boost_libraries(logging-client thread)
 asterisk_scf_add_ice_libraries(IceStorm)
 
 asterisk_scf_component_build_library(logging-client)
diff --git a/client/test/CMakeLists.txt b/client/test/CMakeLists.txt
index fc1e634..e52affb 100644
--- a/client/test/CMakeLists.txt
+++ b/client/test/CMakeLists.txt
@@ -32,11 +32,7 @@ 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)
 
-# For reasons unknown, adding this library causes duplicate symbol errors
-# on Windows.  But without it, Mac and Linux fail to compile
-if(NOT WIN32)
-    asterisk_scf_component_add_boost_libraries(scf-log program_options)
-endif()
+asterisk_scf_component_add_boost_libraries(scf-log program_options)
 
 asterisk_scf_component_build_standalone(scf-log)
 target_link_libraries(scf-log logging-client)
diff --git a/client/test/client-test.cpp b/client/test/client-test.cpp
index 611848a..5503c6c 100644
--- a/client/test/client-test.cpp
+++ b/client/test/client-test.cpp
@@ -14,6 +14,5 @@
  * at the top of the source tree.
  */
 
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE Logger-client
 #include <boost/test/unit_test.hpp>
diff --git a/server/test/server-test.cpp b/server/test/server-test.cpp
index cc7b3bc..a1fbcec 100644
--- a/server/test/server-test.cpp
+++ b/server/test/server-test.cpp
@@ -14,6 +14,5 @@
  * at the top of the source tree.
  */
 
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE Logger-server
 #include <boost/test/unit_test.hpp>

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


-- 
asterisk-scf/release/logger.git