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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  7592be4bfddffc1f8a4845444acf19fee690edfe (commit)
      from  6d5df48797464117d25ab060aa40b554c252a271 (commit)

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


- Log -----------------------------------------------------------------
commit 7592be4bfddffc1f8a4845444acf19fee690edfe
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Fri Dec 3 11:31:50 2010 -0600

    Manage boost link options in CMake.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d666099..8cf2694 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,7 +16,7 @@ asterisk_scf_component_add_file(bridgeservice MediaSplicer.h)
 asterisk_scf_component_add_file(bridgeservice MediaSplicer.cpp)
 asterisk_scf_component_add_ice_libraries(bridgeservice IceStorm)
 asterisk_scf_component_add_ice_libraries(bridgeservice IceBox)
-asterisk_scf_component_add_boost_libraries(bridgeservice thread)
+asterisk_scf_component_add_boost_libraries(bridgeservice thread date_time)
 
 if(NOT logger_dir)
    message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fb53388..8f01913 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -18,8 +18,7 @@ asterisk_scf_component_add_file(bridging_unit_test TestCommandDriver.cpp)
 asterisk_scf_component_add_file(bridging_unit_test TestCommandDriver.h)
 asterisk_scf_component_add_ice_libraries(bridging_unit_test IceStorm)
 asterisk_scf_component_add_ice_libraries(bridging_unit_test IceBox)
-asterisk_scf_component_add_boost_libraries(bridging_unit_test unit_test_framework)
-asterisk_scf_component_add_boost_libraries(bridging_unit_test thread)
+asterisk_scf_component_add_boost_libraries(bridging_unit_test unit_test_framework thread)
 
 if(NOT logger_dir)
    message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
diff --git a/test/SessionListenerI.cpp b/test/SessionListenerI.cpp
index d798509..4d402e3 100644
--- a/test/SessionListenerI.cpp
+++ b/test/SessionListenerI.cpp
@@ -13,7 +13,6 @@
  * the GNU General Public License Version 2. See the LICENSE.txt file
  * at the top of the source tree.
  */
-#define BOOST_TEST_DYN_LINK
 #include "SessionListenerI.h"
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index a9192cf..3c03bac 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -13,8 +13,6 @@
  * the GNU General Public License Version 2. See the LICENSE.txt file
  * at the top of the source tree.
  */
-#define BOOST_TEST_DYN_LINK
-
 #include <BridgeImpl.h>
 #include <BridgeManagerImpl.h>
 

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


-- 
asterisk-scf/release/bridging.git