[asterisk-scf-commits] asterisk-scf/integration/routing.git branch "boostctl" created.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Fri Dec 3 14:01:26 CST 2010


branch "boostctl" has been created
        at  f92548cd04510fb7141fbd094c7d2befa9e20885 (commit)

- Log -----------------------------------------------------------------
commit f92548cd04510fb7141fbd094c7d2befa9e20885
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Fri Dec 3 14:00:36 2010 -0600

    Manage boost link options in CMake.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0a3f840..67caa74 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,7 +23,7 @@ asterisk_scf_component_add_file(BasicRoutingService BridgeManagerAccessor.cpp)
 asterisk_scf_component_add_file(BasicRoutingService BridgeManagerAccessor.h)
 
 asterisk_scf_component_add_ice_libraries(BasicRoutingService IceStorm)
-asterisk_scf_component_add_boost_libraries(BasicRoutingService thread core regex)
+asterisk_scf_component_add_boost_libraries(BasicRoutingService thread date_time core regex)
 
 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 fca99ba..83c2d1f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -18,7 +18,7 @@ asterisk_scf_component_add_file(RoutingTest MockEndpointLocator.h)
 asterisk_scf_component_add_file(RoutingTest MockEndpointLocator.cpp)
 
 asterisk_scf_component_add_ice_libraries(RoutingTest IceStorm)
-asterisk_scf_component_add_boost_libraries(RoutingTest unit_test_framework)
+asterisk_scf_component_add_boost_libraries(RoutingTest unit_test_framework -DBOOST_TEST_DYN_LINK)
 asterisk_scf_component_build_icebox(RoutingTest)
 
 if(integrated_build STREQUAL "true")
diff --git a/test/MockBridge.cpp b/test/MockBridge.cpp
index cb716a6..b383f61 100644
--- a/test/MockBridge.cpp
+++ b/test/MockBridge.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 <Ice/Ice.h>
 
 #include "MockBridge.h"
diff --git a/test/MockBridgeManager.cpp b/test/MockBridgeManager.cpp
index 7a4184e..ae957c0 100644
--- a/test/MockBridgeManager.cpp
+++ b/test/MockBridgeManager.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 <Ice/Ice.h>
 
 #include "MockBridgeManager.h"
diff --git a/test/MockEndpointLocator.cpp b/test/MockEndpointLocator.cpp
index 0b321d1..a8a9066 100644
--- a/test/MockEndpointLocator.cpp
+++ b/test/MockEndpointLocator.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 <Ice/Ice.h>
 
 #include "EndpointIf.h"
diff --git a/test/MockSession.cpp b/test/MockSession.cpp
index 5d17961..31f6ea8 100644
--- a/test/MockSession.cpp
+++ b/test/MockSession.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 <Ice/Ice.h>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/MockSessionEndpoint.cpp b/test/MockSessionEndpoint.cpp
index 0f26071..a945c70 100644
--- a/test/MockSessionEndpoint.cpp
+++ b/test/MockSessionEndpoint.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 <boost/lexical_cast.hpp>
 #include <boost/test/test_tools.hpp>
 #include <Ice/Ice.h>
diff --git a/test/TestRouting.cpp b/test/TestRouting.cpp
index c37ed79..f4c2687 100644
--- a/test/TestRouting.cpp
+++ b/test/TestRouting.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
 #define BOOST_TEST_MODULE BasicRoutingServiceTestSuite
 #define BOOST_TEST_NO_MAIN
 

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


-- 
asterisk-scf/integration/routing.git



More information about the asterisk-scf-commits mailing list