Updates to logging CMake configuration.

deanberris · deanberris · commit a1e87c1104fe · 2013-04-08T22:48:13.000+10:00
diff --git a/concurrency/test/CMakeLists.txt b/concurrency/test/CMakeLists.txt
@@ -5,14 +5,18 @@
 
 include_directories(${CPP-NETLIB_SOURCE_DIR}/concurrency/src
   ${GTEST_INCLUDE_DIRS}
+  ${CPP-NETLIB_SOURCE_DIR}
 )
 
-add_executable(cpp-netlib-thread_pool_test thread_pool_test.cpp)
-target_link_libraries(cpp-netlib-thread_pool_test
-  cppnetlib-concurrency
-  ${Boost_LIBRARIES}
-  ${GTEST_BOTH_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT})
-set_target_properties(cpp-netlib-thread_pool_test
-  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
-add_test(cpp-netlib-thread_pool_test ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-thread_pool_test)
+if (CPP-NETLIB_BUILD_TESTS)
+  add_executable(cpp-netlib-thread_pool_test thread_pool_test.cpp)
+  target_link_libraries(cpp-netlib-thread_pool_test
+    cppnetlib-concurrency
+    ${Boost_LIBRARIES}
+    ${GTEST_BOTH_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT})
+  set_target_properties(cpp-netlib-thread_pool_test PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
+  add_test(cpp-netlib-thread_pool_test
+    ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-thread_pool_test)
+endif()
diff --git a/http/test/CMakeLists.txt b/http/test/CMakeLists.txt
@@ -17,14 +17,6 @@ if (OPENSSL_FOUND)
   add_definitions(-DNETWORK_ENABLE_HTTPS)
 endif()
 
-if( NOT CPP-NETLIB_DISABLE_LOGGING )
-  set( CPP-NETLIB_LOGGING_LIB cppnetlib-logging )
-endif()
-
-# 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)
   # These are the internal (simple) tests.
   set (MESSAGE_TESTS request_base_test request_test response_test
@@ -37,8 +29,7 @@ if (CPP-NETLIB_BUILD_TESTS)
       cppnetlib-http-message
       cppnetlib-http-message-wrappers
       cppnetlib-uri
-      cppnetlib-constants
-      )
+      cppnetlib-constants)
     target_link_libraries(cpp-netlib-http-${test}
       ${Boost_LIBRARIES}
       ${GTEST_BOTH_LIBRARIES}
@@ -49,8 +40,7 @@ if (CPP-NETLIB_BUILD_TESTS)
       cppnetlib-http-message
       cppnetlib-http-message-wrappers
       cppnetlib-uri
-      cppnetlib-constants
-      )
+      cppnetlib-constants)
     set_target_properties(cpp-netlib-http-${test}
       PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
     add_test(cpp-netlib-http-${test}
@@ -73,8 +63,7 @@ if (CPP-NETLIB_BUILD_TESTS)
     cppnetlib-http-message
     cppnetlib-http-message-wrappers
     cppnetlib-http-client
-    cppnetlib-http-client-connections
-    cppnetlib-logging)
+    cppnetlib-http-client-connections)
   if (OPENSSL_FOUND)
     target_link_libraries(cpp-netlib-http-client_test ${OPENSSL_LIBRARIES})
   endif()
diff --git a/logging/CMakeLists.txt b/logging/CMakeLists.txt
@@ -14,6 +14,7 @@ if( NOT CPP-NETLIB_DISABLE_LOGGING )
   # 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 )
+  add_definitions(-DNETWORK_ENABLE_LOGGING)
 
   if(CPP-NETLIB_BUILD_TESTS)
     enable_testing()
diff --git a/logging/src/CMakeLists.txt b/logging/src/CMakeLists.txt
@@ -3,26 +3,8 @@
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
-if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
-  set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
-elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
-  CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
-  if (CPP-NETLIB_DISABLE_LIBCXX)
-    set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
-  else()
-    set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
-  endif()
-endif()
-
-include_directories(${CPP-NETLIB_SOURCE_DIR}/logging/src)
+include_directories(${CPP-NETLIB_SOURCE_DIR}/logging/src ${CPP-NETLIB_SOURCE_DIR})
 set(CPP-NETLIB_LOGGING_SRCS logging.cpp)
 add_library(cppnetlib-logging ${CPP-NETLIB_LOGGING_SRCS})
 foreach (src_file ${CPP-NETLIB_LOGGING_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)
diff --git a/message/src/network/detail/debug.hpp b/message/src/network/detail/debug.hpp
@@ -15,7 +15,7 @@
 
     The user can force the logging to be enabled by defining NETWORK_ENABLE_LOGGING.
 */
-#if defined(NETWORK_DEBUG) && !defined(NETWORK_ENABLE_LOGGING)
+#if defined(NETWORK_DEBUG) && defined(NETWORK_ENABLE_LOGGING)
 #define NETWORK_ENABLE_LOGGING
 #endif
 
