Updated build script references.

Author: glynos

logging/CMakeLists.txt

@@ -3,9 +3,21 @@
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
-add_subdirectory(src)
 
-if(CPP-NETLIB_BUILD_TESTS)
-  enable_testing()
-  add_subdirectory(test)
-endif(CPP-NETLIB_BUILD_TESTS)
+if( CPP-NETLIB_ALWAYS_LOGGING )
+  add_definitions( /D NETWORK_ENABLE_LOGGING )
+endif()
+
+if( NOT CPP-NETLIB_DISABLE_LOGGING )
+  add_subdirectory(src)
+
+  # this library name is defined only if we created the target
+  # if not then it will be empty
+  set( CPP-NETLIB_LOGGING_LIB cppnetlib-logging )
+
+  if(CPP-NETLIB_BUILD_TESTS)
+    enable_testing()
+    add_subdirectory(test)
+  endif(CPP-NETLIB_BUILD_TESTS)
+
+endif()

logging/test/CMakeLists.txt

@@ -1,21 +1,23 @@
 # Copyright (c) A. Joel Lamotte 2012.
+# Copyright (c) Glyn Matthews 2012.
 # Distributed under the Boost Software License, Version 1.0.
 #  (See accompanying file LICENSE_1_0.txt or copy at
 #   http://www.boost.org/LICENSE_1_0.txt)
 
-include_directories(${CPP-NETLIB_SOURCE_DIR}/include)
-include_directories(${CPP-NETLIB_SOURCE_DIR})
+include_directories(${CPP-NETLIB_SOURCE_DIR}/uri/src)
+include_directories(${CPP-NETLIB_SOURCE_DIR}/message/src)
+include_directories(${CPP-NETLIB_SOURCE_DIR}/logging/src)
 
 if (Boost_FOUND)
   set(
     TESTS
-  logging_log_record
+    logging_log_record
     logging_custom_handler
     )
   foreach (test ${TESTS})
     if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
       set_source_files_properties(${test}.cpp
-      PROPERTIES COMPILE_FLAGS "-Wall")
+	PROPERTIES COMPILE_FLAGS "-Wall")
     endif()
     add_executable(cpp-netlib-${test} ${test}.cpp)
     add_dependencies(cpp-netlib-${test} cppnetlib-logging)

message/src/CMakeLists.txt

@@ -16,8 +16,11 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
 endif()
 
 include_directories(${CPP-NETLIB_SOURCE_DIR}/uri/src ${CPP-NETLIB_SOURCE_DIR}/message/src)
-set(CPP-NETLIB_MESSAGE_SRCS message.cpp directives.cpp wrappers.cpp)
+
+set(CPP-NETLIB_MESSAGE_SRCS message.cpp)
 add_library(cppnetlib-message ${CPP-NETLIB_MESSAGE_SRCS})
+add_dependencies(cppnetlib-message cppnetlib-uri)
+target_link_libraries(cppnetlib-message cppnetlib-uri)
 foreach (src_file ${CPP-NETLIB_MESSAGE_SRCS})
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
     set_source_files_properties(${src_file}
@@ -27,3 +30,28 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
         PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
 endif()
 endforeach(src_file)
+
+set(CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS directives.cpp)
+add_library(cppnetlib-message-directives ${CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS})
+foreach (src_file ${CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS})
+if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
+    set_source_files_properties(${src_file}
+        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
+    set_source_files_properties(${src_file}
+        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+endif()
+endforeach(src_file)
+
+set(CPP-NETLIB_MESSAGE_WRAPPERS_SRCS wrappers.cpp)
+add_library(cppnetlib-message-wrappers ${CPP-NETLIB_MESSAGE_WRAPPERS_SRCS})
+foreach (src_file ${CPP-NETLIB_MESSAGE_WRAPPERS_SRCS})
+if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
+    set_source_files_properties(${src_file}
+        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
+    set_source_files_properties(${src_file}
+        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+endif()
+endforeach(src_file)
+

message/test/CMakeLists.txt

@@ -18,9 +18,9 @@ if (Boost_FOUND)
 	PROPERTIES COMPILE_FLAGS "-Wall")
     endif()
     add_executable(cpp-netlib-${test} ${test}.cpp)
-    add_dependencies(cpp-netlib-${test} cppnetlib-uri cppnetlib-message)
+    add_dependencies(cpp-netlib-${test} cppnetlib-uri cppnetlib-message cppnetlib-message-directives cppnetlib-message-wrappers)
     target_link_libraries(cpp-netlib-${test}
-      ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri cppnetlib-message)
+      ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri cppnetlib-message cppnetlib-message-directives cppnetlib-message-wrappers)
     if (OPENSSL_FOUND)
       target_link_libraries(cpp-netlib-${test} ${OPENSSL_LIBRARIES})
     endif()