enabling cpp-netlib to be compiled into a sincle library

this adds the CMake variable 'CPP-NETLIB_BUILD_SINGLE_LIB', which
defaults to OFF and will enable build of a single library 'libcppnetlib'
to be compiled instead of the different separated libraries.

the tests and examples have been adjusted to deal with a single library

the uri submodule has also been changed

Author: torbjoernk

CMakeLists.txt

@@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 2.8)
 project(CPP-NETLIB)
 
 option( CPP-NETLIB_BUILD_SHARED_LIBS "Build cpp-netlib as shared libraries." OFF )
+option( CPP-NETLIB_BUILD_SINGLE_LIB "Build cpp-netlib into a single library" OFF )
 option( CPP-NETLIB_BUILD_TESTS "Build the unit tests." ON )
 option( CPP-NETLIB_BUILD_EXAMPLES "Build the examples using cpp-netlib." ON )
 option( CPP-NETLIB_ALWAYS_LOGGING "Allow cpp-netlib to log debug messages even in non-debug mode." OFF )
@@ -83,6 +84,7 @@ endif(Boost_FOUND)
 
 message(STATUS "CPP-NETLIB options selected:")
 message(STATUS "  CPP-NETLIB_BUILD_SHARED_LIBS: ${CPP-NETLIB_BUILD_SHARED_LIBS}\t(Build cpp-netlib as shared libraries: OFF, ON)")
+message(STATUS "  CPP-NETLIB_BUILD_SINGLE_LIB:  ${CPP-NETLIB_BUILD_SINGLE_LIB}\t(Build cpp-netlib into a single library: OFF, ON)")
 message(STATUS "  CPP-NETLIB_BUILD_TESTS:       ${CPP-NETLIB_BUILD_TESTS}\t(Build the unit tests: ON, OFF)")
 message(STATUS "  CPP-NETLIB_BUILD_EXAMPLES:    ${CPP-NETLIB_BUILD_EXAMPLES}\t(Build the examples using cpp-netlib: ON, OFF)")
 message(STATUS "  CPP-NETLIB_ALWAYS_LOGGING:    ${CPP-NETLIB_ALWAYS_LOGGING}\t(Allow cpp-netlib to log debug messages even in non-debug mode: ON, OFF)")
@@ -123,6 +125,16 @@ if(CPP-NETLIB_BUILD_TESTS)
   set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARIES} ${GMOCK_MAIN_LIBRARIES})
 endif()
 
+if(CPP-NETLIB_BUILD_SINGLE_LIB)
+  include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/concurrency/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/http/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/logging/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/message/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/uri/src
+  )
+endif()
+
 add_subdirectory(uri)
 add_subdirectory(message)
 add_subdirectory(logging)
@@ -132,3 +144,20 @@ add_subdirectory(http)
 if(CPP-NETLIB_BUILD_EXAMPLES)
   add_subdirectory(contrib/http_examples)
 endif()
+
+if(CPP-NETLIB_BUILD_SINGLE_LIB)
+  add_library(cppnetlib
+    ${Uri_SRCS}
+    ${CPP-NETLIB_MESSAGE_SRCS}
+    ${CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS}
+    ${CPP-NETLIB_MESSAGE_WRAPPERS_SRCS}
+    ${CPP-NETLIB_LOGGING_SRCS}
+    ${CPP-NETLIB_HTTP_CLIENT_SRCS}
+    ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS}
+    ${CPP-NETLIB_HTTP_MESSAGE_SRCS}
+    ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS}
+    ${CPP-NETLIB_CONSTANTS_SRCS}
+    ${CPP-NETLIB_CONCURRENCY_SRCS}
+  )
+  target_link_libraries(cppnetlib ${Boost_LIBRARIES})
+endif()

concurrency/CMakeLists.txt

@@ -9,3 +9,6 @@ if(CPP-NETLIB_BUILD_TESTS)
   enable_testing()
   add_subdirectory(test)
 endif(CPP-NETLIB_BUILD_TESTS)
+
+# propagate sources to parent directory for one-lib-build
+set(CPP-NETLIB_CONCURRENCY_SRCS ${CPP-NETLIB_CONCURRENCY_SRCS} PARENT_SCOPE)

concurrency/src/CMakeLists.txt

@@ -16,8 +16,10 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
   endif()
 endif()
 
-set(CPP-NETLIB_CONCURRENCY_SRCS thread_pool.cpp)
-add_library(cppnetlib-concurrency ${CPP-NETLIB_CONCURRENCY_SRCS})
+set(CPP-NETLIB_CONCURRENCY_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/thread_pool.cpp)
+if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
+  add_library(cppnetlib-concurrency ${CPP-NETLIB_CONCURRENCY_SRCS})
+endif()
 foreach (src_file ${CPP-NETLIB_CONCURRENCY_SRCS})
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
     set_source_files_properties(${src_file}
@@ -27,3 +29,6 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
         PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
 endif()
 endforeach(src_file)
+
+# propagate sources to parent directory for one-lib-build
+set(CPP-NETLIB_CONCURRENCY_SRCS ${CPP-NETLIB_CONCURRENCY_SRCS} PARENT_SCOPE)

concurrency/test/CMakeLists.txt

@@ -7,11 +7,16 @@ include_directories(${CPP-NETLIB_SOURCE_DIR}/concurrency/src
   ${GTEST_INCLUDE_DIRS}
 )
 
+if(CPP-NETLIB_BUILD_SINGLE_LIB)
+  set(link_cppnetlib_lib cppnetlib)
+else()
+  set(link_cppnetlib_lib cppnetlib-concurrency)
+endif()
 set_source_files_properties(thread_pool_test.cpp
   PROPERTIES COMPILE_FLAGS "-Wall")
 add_executable(cpp-netlib-thread_pool_test thread_pool_test.cpp)
 target_link_libraries(cpp-netlib-thread_pool_test
-  cppnetlib-concurrency
+  ${link_cppnetlib_lib}
   ${Boost_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT})

contrib/http_examples/CMakeLists.txt

@@ -40,9 +40,10 @@ set(BOOST_SERVER_LIBS
   ${Boost_PROGRAM_OPTIONS_LIBRARY}
   )
 
-target_link_libraries(simple_wget
-    ${BOOST_CLIENT_LIBS}
-    ${CMAKE_THREAD_LIBS_INIT}
+if(CPP-NETLIB_BUILD_SINGLE_LIB)
+  set(simple_wget_linklibs cppnetlib)
+else()
+  set(simple_wget_linklibs
     cppnetlib-uri
     cppnetlib-message
     cppnetlib-message-directives
@@ -53,10 +54,16 @@ target_link_libraries(simple_wget
     cppnetlib-http-client
     cppnetlib-http-client-connections
     ${CPP-NETLIB_LOGGING_LIB})
-
-target_link_libraries(atom_reader
+endif()
+target_link_libraries(simple_wget
     ${BOOST_CLIENT_LIBS}
     ${CMAKE_THREAD_LIBS_INIT}
+    ${simple_wget_linklibs})
+
+if(CPP-NETLIB_BUILD_SINGLE_LIB)
+  set(atom_reader_linklibs cppnetlib)
+else()
+  set(atom_reader_linklibs
     cppnetlib-uri
     cppnetlib-message
     cppnetlib-message-directives
@@ -67,10 +74,16 @@ target_link_libraries(atom_reader
     cppnetlib-http-client
     cppnetlib-http-client-connections
     ${CPP-NETLIB_LOGGING_LIB})
-
-target_link_libraries(rss_reader
+endif()
+target_link_libraries(atom_reader
     ${BOOST_CLIENT_LIBS}
     ${CMAKE_THREAD_LIBS_INIT}
+    ${atom_reader_linklibs})
+
+if(CPP-NETLIB_BUILD_SINGLE_LIB)
+  set(rss_reader_linklibs cppnetlib)
+else()
+  set(rss_reader_linklibs
     cppnetlib-uri
     cppnetlib-message
     cppnetlib-message-directives
@@ -80,6 +93,11 @@ target_link_libraries(rss_reader
     cppnetlib-http-client
     cppnetlib-http-client-connections
     ${CPP-NETLIB_LOGGING_LIB})
+endif()
+target_link_libraries(rss_reader
+    ${BOOST_CLIENT_LIBS}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${rss_reader_linklibs})
 
 #target_link_libraries(twitter_search
 #    ${BOOST_CLIENT_LIBS}
@@ -102,9 +120,10 @@ target_link_libraries(rss_reader
 #    cppnetlib-http-server
 #    ${CPP-NETLIB_LOGGING_LIB})
 
-target_link_libraries(hello_world_client
-    ${BOOST_CLIENT_LIBS}
-    ${CMAKE_THREAD_LIBS_INIT}
+if(CPP-NETLIB_BUILD_SINGLE_LIB)
+  set(hello_world_client_linklibs cppnetlib)
+else()
+  set(hello_world_client_linklibs
     cppnetlib-uri
     cppnetlib-message
     cppnetlib-message-directives
@@ -115,6 +134,11 @@ target_link_libraries(hello_world_client
     cppnetlib-http-client
     cppnetlib-http-client-connections
     ${CPP-NETLIB_LOGGING_LIB})
+endif()
+target_link_libraries(hello_world_client
+    ${BOOST_CLIENT_LIBS}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${hello_world_client_linklibs})
 
 if (OPENSSL_FOUND)
   target_link_libraries(simple_wget ${OPENSSL_LIBRARIES})

http/CMakeLists.txt

@@ -9,3 +9,10 @@ if(CPP-NETLIB_BUILD_TESTS)
   enable_testing()
   add_subdirectory(test)
 endif(CPP-NETLIB_BUILD_TESTS)
+
+# propagate sources to parent directory for one-lib-build
+set(CPP-NETLIB_HTTP_MESSAGE_SRCS ${CPP-NETLIB_HTTP_MESSAGE_SRCS} PARENT_SCOPE)
+set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS} PARENT_SCOPE)
+set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS} PARENT_SCOPE)
+set(CPP-NETLIB_HTTP_CLIENT_SRCS ${CPP-NETLIB_HTTP_CLIENT_SRCS} PARENT_SCOPE)
+set(CPP-NETLIB_CONSTANTS_SRCS ${CPP-NETLIB_CONSTANTS_SRCS} PARENT_SCOPE)

http/src/CMakeLists.txt

@@ -33,14 +33,18 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
   endif()
 endif()
 
-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}
-  cppnetlib-message)
-target_link_libraries(cppnetlib-http-message
-  ${Boost_LIBRARIES}
-  cppnetlib-message)
+set(CPP-NETLIB_HTTP_MESSAGE_SRCS
+  ${CMAKE_CURRENT_SOURCE_DIR}/http/request.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/http/response.cpp)
+if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
+  add_library(cppnetlib-http-message ${CPP-NETLIB_HTTP_MESSAGE_SRCS})
+  add_dependencies(cppnetlib-http-message
+#     ${Boost_LIBRARIES}
+    cppnetlib-message)
+  target_link_libraries(cppnetlib-http-message
+    ${Boost_LIBRARIES}
+    cppnetlib-message)
+endif()
 foreach (src_file ${CPP-NETLIB_HTTP_MESSAGE_SRCS})
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
     set_source_files_properties(${src_file}
@@ -51,8 +55,10 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
 endif()
 endforeach(src_file)
 
-set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS http/message/wrappers.cpp)
-add_library(cppnetlib-http-message-wrappers ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS})
+set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/http/message/wrappers.cpp)
+if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
+  add_library(cppnetlib-http-message-wrappers ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS})
+endif()
 foreach (src_file ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS})
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
     set_source_files_properties(${src_file}
@@ -118,17 +124,19 @@ endforeach(src_file)
 #endforeach(src_file)
 
 set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS
-    http/client_connections.cpp
-    http/simple_connection_manager.cpp
-    http/simple_connection_factory.cpp
-    http/connection_delegate_factory.cpp
-    http/client_resolver_delegate.cpp
-    http/client_resolver_delegate_factory.cpp
-    http/client_connection_delegates.cpp
-    http/client_connection_factory.cpp
-    http/client_async_resolver.cpp
-    http/client_connection_normal.cpp)
-add_library(cppnetlib-http-client-connections ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS})
+    ${CMAKE_CURRENT_SOURCE_DIR}/http/client_connections.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/http/simple_connection_manager.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/http/simple_connection_factory.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/http/connection_delegate_factory.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/http/client_resolver_delegate.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/http/client_resolver_delegate_factory.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/http/client_connection_delegates.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/http/client_connection_factory.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/http/client_async_resolver.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/http/client_connection_normal.cpp)
+if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
+  add_library(cppnetlib-http-client-connections ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS})
+endif()
 foreach (src_file ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS})
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
     set_source_files_properties(${src_file}
@@ -140,31 +148,33 @@ endif()
 endforeach(src_file)
 
 set(CPP-NETLIB_HTTP_CLIENT_SRCS
-    http/client.cpp)
-add_library(cppnetlib-http-client ${CPP-NETLIB_HTTP_CLIENT_SRCS})
-add_dependencies(cppnetlib-http-client
-  ${CPP-NETLIB_LOGGING_LIB}
-  cppnetlib-constants
-  cppnetlib-uri
-  cppnetlib-message
-  cppnetlib-message-wrappers
-  cppnetlib-message-directives
-  cppnetlib-http-message
-  cppnetlib-http-message-wrappers
-  cppnetlib-http-client-connections
-  )
-target_link_libraries(cppnetlib-http-client
-  ${Boost_LIBRARIES}
-  ${CPP-NETLIB_LOGGING_LIB}
-  cppnetlib-constants
-  cppnetlib-uri
-  cppnetlib-message
-  cppnetlib-message-wrappers
-  cppnetlib-message-directives
-  cppnetlib-http-message
-  cppnetlib-http-message-wrappers
-  cppnetlib-http-client-connections
-  )
+    ${CMAKE_CURRENT_SOURCE_DIR}/http/client.cpp)
+if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
+  add_library(cppnetlib-http-client ${CPP-NETLIB_HTTP_CLIENT_SRCS})
+  add_dependencies(cppnetlib-http-client
+    ${CPP-NETLIB_LOGGING_LIB}
+    cppnetlib-constants
+    cppnetlib-uri
+    cppnetlib-message
+    cppnetlib-message-wrappers
+    cppnetlib-message-directives
+    cppnetlib-http-message
+    cppnetlib-http-message-wrappers
+    cppnetlib-http-client-connections
+    )
+  target_link_libraries(cppnetlib-http-client
+    ${Boost_LIBRARIES}
+    ${CPP-NETLIB_LOGGING_LIB}
+    cppnetlib-constants
+    cppnetlib-uri
+    cppnetlib-message
+    cppnetlib-message-wrappers
+    cppnetlib-message-directives
+    cppnetlib-http-message
+    cppnetlib-http-message-wrappers
+    cppnetlib-http-client-connections
+    )
+endif()
 foreach (src_file ${CPP-NETLIB_HTTP_CLIENT_SRCS})
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
     set_source_files_properties(${src_file}
@@ -175,8 +185,10 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
 endif()
 endforeach(src_file)
 
-set(CPP-NETLIB_CONSTANTS_SRCS constants.cpp)
-add_library(cppnetlib-constants ${CPP-NETLIB_CONSTANTS_SRCS})
+set(CPP-NETLIB_CONSTANTS_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/constants.cpp)
+if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
+  add_library(cppnetlib-constants ${CPP-NETLIB_CONSTANTS_SRCS})
+endif()
 foreach (src_file ${CPP-NETLIB_CONSTANTS_SRCS})
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
     set_source_files_properties(${src_file}
@@ -186,3 +198,11 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
         PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
 endif()
 endforeach(src_file)
+
+
+# propagate sources to parent directory for one-lib-build
+set(CPP-NETLIB_HTTP_MESSAGE_SRCS ${CPP-NETLIB_HTTP_MESSAGE_SRCS} PARENT_SCOPE)
+set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS} PARENT_SCOPE)
+set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS} PARENT_SCOPE)
+set(CPP-NETLIB_HTTP_CLIENT_SRCS ${CPP-NETLIB_HTTP_CLIENT_SRCS} PARENT_SCOPE)
+set(CPP-NETLIB_CONSTANTS_SRCS ${CPP-NETLIB_CONSTANTS_SRCS} PARENT_SCOPE)