Replaced BOOST_DYN_LINK code with the same options that appear on the master branch (CPP-NETLIB_BUILD_SHARED_LIBS).

glynos · glynos · commit a4057db8a508 · 2013-08-14T18:25:43.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,15 +6,18 @@
 cmake_minimum_required(VERSION 2.8)
 project(CPP-NETLIB)
 
-option (BOOST_DYN_LINK
-  "Build the project using dynamic linking for the boost testing libs"
-  OFF)
-if (BOOST_DYN_LINK)
+option( CPP-NETLIB_BUILD_SHARED_LIBS "Build cpp-netlib as shared libraries." OFF )
+
+if(CPP-NETLIB_BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
   message ("Linking boost testing libs dynamically...")
+  set(Boost_USE_STATIC_LIBS OFF)
+  set(CPP-NETLIB_BUILD_SHARED_LIBS ON)
   add_definitions(-DBOOST_TEST_DYN_LINK)
-elseif (BOOST_DYN_LINK)
+else()
   set(Boost_USE_STATIC_LIBS ON)
-endif(BOOST_DYN_LINK)
+  set(CPP-NETLIB_BUILD_SHARED_LIBS OFF)
+  set(BUILD_SHARED_LIBS OFF)
+endif()
 
 set(Boost_USE_MULTI_THREADED ON)
 find_package( Boost 1.45.0 REQUIRED unit_test_framework system regex date_time thread filesystem program_options chrono )
diff --git a/libs/mime/test/CMakeLists.txt b/libs/mime/test/CMakeLists.txt
@@ -2,15 +2,18 @@ include_directories(${CPP-NETLIB_SOURCE_DIR})
 find_package ( Boost 1.41.0 COMPONENTS unit_test_framework )
 file ( COPY TestMessages DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
 
-option (BOOST_DYN_LINK
-  "Build the project using dynamic linking for the boost test libs"
-  OFF)
-if (BOOST_DYN_LINK)
-  message ("Do not try to link boost test libs dynamically for this test...")
-  remove_definitions(-DBOOST_TEST_DYN_LINK)
-elseif (BOOST_DYN_LINK)
+option( CPP-NETLIB_BUILD_SHARED_LIBS "Build cpp-netlib as shared libraries." OFF )
+
+if(CPP-NETLIB_BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
+  message ("Linking boost testing libs dynamically...")
+  set(Boost_USE_STATIC_LIBS OFF)
+  set(CPP-NETLIB_BUILD_SHARED_LIBS ON)
+  add_definitions(-DBOOST_TEST_DYN_LINK)
+else()
   set(Boost_USE_STATIC_LIBS ON)
-endif(BOOST_DYN_LINK)
+  set(CPP-NETLIB_BUILD_SHARED_LIBS OFF)
+  set(BUILD_SHARED_LIBS OFF)
+endif()
 
 set ( Boost_USE_MULTITHREADED ON )
 
