From eaa0cacd0657037e25031d0137c735cce9e96a6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B6rn=20Klatt?= <opensource@torbjoern-klatt.de>
Date: Sat, 3 Nov 2012 21:58:09 +0100
Subject: [PATCH 1/5] add CMake options for shared libs, tests, examples

Add options to CMake to enable build of cpp-netlib as shared libraries.
New options are:
  BUILD_SHARED_LIBS (default OFF)
  BUILD_TESTS (default ON)
  BUILD_EXAMPLES (default ON)

As the current (CMakeLists-)setup of the tests and examples does not
work with a shared cpp-netlib build, those get not build then.

Specify with `cmake -D<OPTION>=<ON|OFF>`
---
 CMakeLists.txt | 50 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9785c2e7a..46d96f6ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,12 +7,30 @@
 cmake_minimum_required(VERSION 2.8)
 project(CPP-NETLIB)
 
+option(BUILD_SHARED_LIBS "Build cpp-netlib as shared libraries." OFF)
+option(BUILD_TESTS "Build the unit tests." ON)
+option(BUILD_EXAMPLES "Build the examples using cpp-netlib." ON)
+
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 find_package( ICU )
 
-set(Boost_USE_STATIC_LIBS ON)
+if(BUILD_SHARED_LIBS)
+  set(Boost_USE_STATIC_LIBS OFF)
+  # TODO/NOTE:
+  # the unit tests and examples won't compile with the current setup and
+  # shared libraries yet
+  set(BUILD_TESTS OFF)
+  set(BUILD_EXAMPLES OFF)
+else()
+  set(Boost_USE_STATIC_LIBS ON)
+endif()
 set(Boost_USE_MULTITHREADED ON)
-find_package( Boost 1.45.0 REQUIRED unit_test_framework system regex date_time thread chrono filesystem program_options )
+if(BUILD_TESTS)
+  set(Boost_COMPONENTS unit_test_framework system regex date_time thread chrono filesystem program_options )
+else()
+  set(Boost_COMPONENTS system regex date_time thread chrono filesystem program_options )
+endif()
+find_package( Boost 1.45.0 REQUIRED ${Boost_COMPONENTS} )
 find_package( OpenSSL )
 find_package( Threads )
 set(CMAKE_VERBOSE_MAKEFILE true)
@@ -51,13 +69,27 @@ if (Boost_FOUND)
       add_definitions(-D_WIN32_WINNT=0x0501)
     endif(WIN32)
     include_directories(${Boost_INCLUDE_DIRS})
-    enable_testing()
+    if(BUILD_TESTS)
+      enable_testing()
+    endif()
     add_subdirectory(libs/network/src)
-    add_subdirectory(libs/network/test)
-    if (NOT MSVC)
-      add_subdirectory(libs/mime/test)
-    endif(NOT MSVC)
-    add_subdirectory(libs/network/example)
+    if(BUILD_TESTS)
+      enable_testing()
+      add_subdirectory(libs/network/test)
+      if (NOT MSVC)
+        add_subdirectory(libs/mime/test)
+      endif(NOT MSVC)
+    endif()
+    if(BUILD_EXAMPLES)
+      add_subdirectory(libs/network/example)
+    endif()
 endif(Boost_FOUND)
 
-enable_testing()
+if(BUILD_TESTS)
+  enable_testing()
+endif()
+
+message(STATUS "Options selected:")
+message(STATUS "  BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}\t(Build cpp-netlib as shared libraries: OFF, ON)")
+message(STATUS "  BUILD_TESTS:       ${BUILD_TESTS}\t(Build the unit tests: ON, OFF)")
+message(STATUS "  BUILD_EXAMPLES:    ${BUILD_EXAMPLES}\t(Build the examples using cpp-netlib: ON, OFF)")

From 0ca215c65d068b7949bf7cbd755abe139798a214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B6rn=20Klatt?= <opensource@torbjoern-klatt.de>
Date: Sun, 4 Nov 2012 00:27:45 +0100
Subject: [PATCH 2/5] removed obsolete lines in CMakeLists

keeping those lines will break previously introduced options
---
 libs/mime/test/CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libs/mime/test/CMakeLists.txt b/libs/mime/test/CMakeLists.txt
index 141b077ee..8c1ac68ae 100644
--- a/libs/mime/test/CMakeLists.txt
+++ b/libs/mime/test/CMakeLists.txt
@@ -1,7 +1,4 @@
 include_directories(${CPP-NETLIB_SOURCE_DIR})
-find_package ( Boost 1.41.0 COMPONENTS unit_test_framework )
-set ( Boost_USE_STATIC_LIBS ON )
-set ( Boost_USE_MULTITHREADED ON )
 
 if ( Boost_FOUND )
     add_executable ( mime-roundtrip mime-roundtrip.cpp )

From a9cc84aa9030ec44509a15a303522fc26d8cb373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B6rn=20Klatt?= <opensource@torbjoern-klatt.de>
Date: Sun, 4 Nov 2012 00:39:39 +0100
Subject: [PATCH 3/5] adjusted build instructions of test for shared libs

The unit tests will compile and run now as well for cpp-netlib compiled
as shared libraries.
---
 CMakeLists.txt                                              | 4 +---
 libs/network/src/CMakeLists.txt                             | 6 +++---
 libs/network/test/CMakeLists.txt                            | 4 ++++
 libs/network/test/http/client_constructor_test.cpp          | 3 +++
 libs/network/test/http/client_get_different_port_test.cpp   | 3 +++
 libs/network/test/http/client_get_streaming_test.cpp        | 3 +++
 libs/network/test/http/client_get_test.cpp                  | 3 +++
 libs/network/test/http/client_get_timeout_test.cpp          | 3 +++
 libs/network/test/http/request_base_test.cpp                | 3 +++
 libs/network/test/http/request_linearize_test.cpp           | 3 +++
 libs/network/test/http/request_test.cpp                     | 3 +++
 libs/network/test/http/response_test.cpp                    | 3 +++
 .../network/test/http/server_async_run_stop_concurrency.cpp | 4 ++++
 libs/network/test/http/server_constructor_test.cpp          | 3 +++
 libs/network/test/message_test.cpp                          | 3 +++
 libs/network/test/message_transform_test.cpp                | 3 +++
 libs/network/test/uri/relative_uri_test.cpp                 | 3 +++
 libs/network/test/uri/scheme_tests.cpp                      | 3 +++
 libs/network/test/uri/uri_builder_stream_test.cpp           | 3 +++
 libs/network/test/uri/uri_builder_test.cpp                  | 3 +++
 libs/network/test/uri/uri_encoding_test.cpp                 | 3 +++
 libs/network/test/uri/uri_test.cpp                          | 3 +++
 libs/network/test/utils_thread_pool.cpp                     | 3 +++
 23 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46d96f6ae..964d4d9cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,9 +17,7 @@ find_package( ICU )
 if(BUILD_SHARED_LIBS)
   set(Boost_USE_STATIC_LIBS OFF)
   # TODO/NOTE:
-  # the unit tests and examples won't compile with the current setup and
-  # shared libraries yet
-  set(BUILD_TESTS OFF)
+  # the examples won't compile with the current setup and shared libraries yet
   set(BUILD_EXAMPLES OFF)
 else()
   set(Boost_USE_STATIC_LIBS ON)
diff --git a/libs/network/src/CMakeLists.txt b/libs/network/src/CMakeLists.txt
index a94600d55..ee4c483d8 100644
--- a/libs/network/src/CMakeLists.txt
+++ b/libs/network/src/CMakeLists.txt
@@ -61,7 +61,7 @@ endforeach(src_file)
 set(CPP-NETLIB_HTTP_MESSAGE_SRCS http/request.cpp http/response.cpp)
 add_library(cppnetlib-http-message ${CPP-NETLIB_HTTP_MESSAGE_SRCS})
 add_dependencies(cppnetlib-http-message
-  ${Boost_LIBRARIES}
+#   ${Boost_LIBRARIES}
   cppnetlib-message)
 target_link_libraries(cppnetlib-http-message
   ${Boost_LIBRARIES}
@@ -99,7 +99,7 @@ set(CPP-NETLIB_HTTP_SERVER_SRCS
     )
 add_library(cppnetlib-http-server ${CPP-NETLIB_HTTP_SERVER_SRCS})
 add_dependencies(cppnetlib-http-server
-  ${Boost_LIBRARIES}
+#   ${Boost_LIBRARIES}
   cppnetlib-constants
   cppnetlib-uri
   cppnetlib-message
@@ -150,7 +150,7 @@ set(CPP-NETLIB_HTTP_CLIENT_SRCS
     http/client.cpp)
 add_library(cppnetlib-http-client ${CPP-NETLIB_HTTP_CLIENT_SRCS})
 add_dependencies(cppnetlib-http-client
-  ${Boost_LIBRARIES}
+#   ${Boost_LIBRARIES}
   cppnetlib-constants
   cppnetlib-uri
   cppnetlib-message
diff --git a/libs/network/test/CMakeLists.txt b/libs/network/test/CMakeLists.txt
index c482ac85b..6baf32d47 100644
--- a/libs/network/test/CMakeLists.txt
+++ b/libs/network/test/CMakeLists.txt
@@ -5,6 +5,10 @@
 
 include_directories(${CPP-NETLIB_SOURCE_DIR}/include)
 
+if(BUILD_SHARED_LIBS)
+    add_definitions(-DBUILD_SHARED_LIBS)
+endif()
+
 add_subdirectory(uri)
 add_subdirectory(http)
 
diff --git a/libs/network/test/http/client_constructor_test.cpp b/libs/network/test/http/client_constructor_test.cpp
index 327e7f5a2..e1f789cee 100644
--- a/libs/network/test/http/client_constructor_test.cpp
+++ b/libs/network/test/http/client_constructor_test.cpp
@@ -5,6 +5,9 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE HTTP 1.0 Client Constructor Test
 #include <network/include/http/client.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/libs/network/test/http/client_get_different_port_test.cpp b/libs/network/test/http/client_get_different_port_test.cpp
index f2f7ef9ed..3d929e356 100644
--- a/libs/network/test/http/client_get_different_port_test.cpp
+++ b/libs/network/test/http/client_get_different_port_test.cpp
@@ -5,6 +5,9 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE HTTP Client Get Different Port Test
 #include <network/include/http/client.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/libs/network/test/http/client_get_streaming_test.cpp b/libs/network/test/http/client_get_streaming_test.cpp
index fba0d83d1..92c2a0668 100644
--- a/libs/network/test/http/client_get_streaming_test.cpp
+++ b/libs/network/test/http/client_get_streaming_test.cpp
@@ -4,6 +4,9 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE HTTP 1.1 Get Streaming Test
 #include <network/include/http/client.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/libs/network/test/http/client_get_test.cpp b/libs/network/test/http/client_get_test.cpp
index f60bc1ba3..6bd1dac36 100644
--- a/libs/network/test/http/client_get_test.cpp
+++ b/libs/network/test/http/client_get_test.cpp
@@ -4,6 +4,9 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE HTTP 1.0 Get Test
 #include <network/include/http/client.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/libs/network/test/http/client_get_timeout_test.cpp b/libs/network/test/http/client_get_timeout_test.cpp
index 7529b4491..d8cfb768d 100644
--- a/libs/network/test/http/client_get_timeout_test.cpp
+++ b/libs/network/test/http/client_get_timeout_test.cpp
@@ -5,6 +5,9 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE HTTP Client Get Timeout Test
 #include <network/include/http/client.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/libs/network/test/http/request_base_test.cpp b/libs/network/test/http/request_base_test.cpp
index fd8ebbf7a..354a6debe 100644
--- a/libs/network/test/http/request_base_test.cpp
+++ b/libs/network/test/http/request_base_test.cpp
@@ -4,6 +4,9 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE HTTP Request Storage Base Test
 #include <network/protocol/http/request/request_base.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/libs/network/test/http/request_linearize_test.cpp b/libs/network/test/http/request_linearize_test.cpp
index 4aa93ade0..336f4c1d1 100644
--- a/libs/network/test/http/request_linearize_test.cpp
+++ b/libs/network/test/http/request_linearize_test.cpp
@@ -5,6 +5,9 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE HTTP Request Linearize Test
 #include <network/protocol/http/request.hpp>
 #include <network/protocol/http/algorithms/linearize.hpp>
diff --git a/libs/network/test/http/request_test.cpp b/libs/network/test/http/request_test.cpp
index 59763e3f9..632ae9a07 100644
--- a/libs/network/test/http/request_test.cpp
+++ b/libs/network/test/http/request_test.cpp
@@ -4,6 +4,9 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE HTTP Request Test
 #include <network/protocol/http/request.hpp>
 #include <network/protocol/http/message/wrappers.hpp>
diff --git a/libs/network/test/http/response_test.cpp b/libs/network/test/http/response_test.cpp
index bd2c176a6..4e93db284 100644
--- a/libs/network/test/http/response_test.cpp
+++ b/libs/network/test/http/response_test.cpp
@@ -4,6 +4,9 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE HTTP Client Response Test
 #include <network/protocol/http/response.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/libs/network/test/http/server_async_run_stop_concurrency.cpp b/libs/network/test/http/server_async_run_stop_concurrency.cpp
index d602ad94d..70d2602e1 100644
--- a/libs/network/test/http/server_async_run_stop_concurrency.cpp
+++ b/libs/network/test/http/server_async_run_stop_concurrency.cpp
@@ -1,3 +1,7 @@
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+# define BOOST_TEST_NO_MAIN
+#endif
 #define BOOST_TEST_MODULE HTTP Asynchronous Server Tests
 
 #include <network/include/http/server.hpp>
diff --git a/libs/network/test/http/server_constructor_test.cpp b/libs/network/test/http/server_constructor_test.cpp
index a45179ba5..35907a634 100644
--- a/libs/network/test/http/server_constructor_test.cpp
+++ b/libs/network/test/http/server_constructor_test.cpp
@@ -5,6 +5,9 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE HTTP Server Construtor Tests
 
 #include <network/include/http/server.hpp>
diff --git a/libs/network/test/message_test.cpp b/libs/network/test/message_test.cpp
index 3ec45e1d4..63b958c9c 100644
--- a/libs/network/test/message_test.cpp
+++ b/libs/network/test/message_test.cpp
@@ -5,6 +5,9 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE message test
 #include <boost/config/warning_disable.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/libs/network/test/message_transform_test.cpp b/libs/network/test/message_transform_test.cpp
index 3a5d21e71..b021b4ecf 100644
--- a/libs/network/test/message_transform_test.cpp
+++ b/libs/network/test/message_transform_test.cpp
@@ -5,6 +5,9 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE message test
 #include <boost/config/warning_disable.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/libs/network/test/uri/relative_uri_test.cpp b/libs/network/test/uri/relative_uri_test.cpp
index 08ebbfd47..d7855fe50 100644
--- a/libs/network/test/uri/relative_uri_test.cpp
+++ b/libs/network/test/uri/relative_uri_test.cpp
@@ -4,6 +4,9 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE Relative URL Test
 #include <boost/config/warning_disable.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/libs/network/test/uri/scheme_tests.cpp b/libs/network/test/uri/scheme_tests.cpp
index 42df85482..fa4c01dca 100644
--- a/libs/network/test/uri/scheme_tests.cpp
+++ b/libs/network/test/uri/scheme_tests.cpp
@@ -3,6 +3,9 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE URI Scheme Test
 #include <boost/config/warning_disable.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/libs/network/test/uri/uri_builder_stream_test.cpp b/libs/network/test/uri/uri_builder_stream_test.cpp
index 73ab0dbb5..beb6c5376 100644
--- a/libs/network/test/uri/uri_builder_stream_test.cpp
+++ b/libs/network/test/uri/uri_builder_stream_test.cpp
@@ -4,6 +4,9 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE URI builder stream test
 #include <boost/config/warning_disable.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/libs/network/test/uri/uri_builder_test.cpp b/libs/network/test/uri/uri_builder_test.cpp
index e04a0c3c4..605c63fd3 100644
--- a/libs/network/test/uri/uri_builder_test.cpp
+++ b/libs/network/test/uri/uri_builder_test.cpp
@@ -4,6 +4,9 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE URI builder test
 #include <boost/config/warning_disable.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/libs/network/test/uri/uri_encoding_test.cpp b/libs/network/test/uri/uri_encoding_test.cpp
index 6a2b4fa98..eba1079f0 100644
--- a/libs/network/test/uri/uri_encoding_test.cpp
+++ b/libs/network/test/uri/uri_encoding_test.cpp
@@ -4,6 +4,9 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE URI encoding test
 #include <boost/config/warning_disable.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/libs/network/test/uri/uri_test.cpp b/libs/network/test/uri/uri_test.cpp
index 360ee0be0..9b9202015 100644
--- a/libs/network/test/uri/uri_test.cpp
+++ b/libs/network/test/uri/uri_test.cpp
@@ -4,6 +4,9 @@
 // (See accompanying file LICENSE_1_0.txt of copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE URI Test
 #include <boost/config/warning_disable.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/libs/network/test/utils_thread_pool.cpp b/libs/network/test/utils_thread_pool.cpp
index 7bbb75ef5..8a615fb5e 100644
--- a/libs/network/test/utils_thread_pool.cpp
+++ b/libs/network/test/utils_thread_pool.cpp
@@ -5,6 +5,9 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#ifdef BUILD_SHARED_LIBS
+# define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE utils thread pool test
 #include <boost/config/warning_disable.hpp>
 #include <boost/test/unit_test.hpp>

From 8fdaa5ab793b88595629356123e7845c2aeba662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B6rn=20Klatt?= <opensource@torbjoern-klatt.de>
Date: Sun, 4 Nov 2012 01:06:58 +0100
Subject: [PATCH 4/5] examples are working with shared lib

'cppnetlib-utils-thread_pool' had to be added to the list of linked
libraries for 'cppnetlib-http-server'. For the static case this was not
a problem but in the shared case symbols were missing.

Listing external shared or static libraries in 'add_dependencies' is not
required. This CMake command is for adding dependencies between
different targets defined by 'add_executable', 'add_library' or
'add_custom_target'.
---
 CMakeLists.txt                  | 3 ---
 libs/network/src/CMakeLists.txt | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 964d4d9cc..c3dcd6ad0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,9 +16,6 @@ find_package( ICU )
 
 if(BUILD_SHARED_LIBS)
   set(Boost_USE_STATIC_LIBS OFF)
-  # TODO/NOTE:
-  # the examples won't compile with the current setup and shared libraries yet
-  set(BUILD_EXAMPLES OFF)
 else()
   set(Boost_USE_STATIC_LIBS ON)
 endif()
diff --git a/libs/network/src/CMakeLists.txt b/libs/network/src/CMakeLists.txt
index ee4c483d8..c41f5d612 100644
--- a/libs/network/src/CMakeLists.txt
+++ b/libs/network/src/CMakeLists.txt
@@ -99,7 +99,6 @@ set(CPP-NETLIB_HTTP_SERVER_SRCS
     )
 add_library(cppnetlib-http-server ${CPP-NETLIB_HTTP_SERVER_SRCS})
 add_dependencies(cppnetlib-http-server
-#   ${Boost_LIBRARIES}
   cppnetlib-constants
   cppnetlib-uri
   cppnetlib-message
@@ -108,6 +107,7 @@ add_dependencies(cppnetlib-http-server
   cppnetlib-http-message
   cppnetlib-http-message-wrappers
   cppnetlib-http-server-parsers
+  cppnetlib-utils-thread_pool
   )
 target_link_libraries(cppnetlib-http-server
   ${Boost_LIBRARIES}
@@ -119,6 +119,7 @@ target_link_libraries(cppnetlib-http-server
   cppnetlib-http-message
   cppnetlib-http-message-wrappers
   cppnetlib-http-server-parsers
+  cppnetlib-utils-thread_pool
   )
 foreach (src_file ${CPP-NETLIB_HTTP_SERVER_SRCS})
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
@@ -150,7 +151,6 @@ set(CPP-NETLIB_HTTP_CLIENT_SRCS
     http/client.cpp)
 add_library(cppnetlib-http-client ${CPP-NETLIB_HTTP_CLIENT_SRCS})
 add_dependencies(cppnetlib-http-client
-#   ${Boost_LIBRARIES}
   cppnetlib-constants
   cppnetlib-uri
   cppnetlib-message

From 8131f4999012e3cd9c8e2f0cdface5df4bd8735a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B6rn=20Klatt?= <opensource@torbjoern-klatt.de>
Date: Sun, 4 Nov 2012 13:40:57 +0100
Subject: [PATCH 5/5] Update minimum required Boost from 1.45 to 1.51

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3dcd6ad0..519146c14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ if(BUILD_TESTS)
 else()
   set(Boost_COMPONENTS system regex date_time thread chrono filesystem program_options )
 endif()
-find_package( Boost 1.45.0 REQUIRED ${Boost_COMPONENTS} )
+find_package( Boost 1.51 REQUIRED ${Boost_COMPONENTS} )
 find_package( OpenSSL )
 find_package( Threads )
 set(CMAKE_VERBOSE_MAKEFILE true)