Merge pull request #211 from w0land/master-integration

deanberris · deanberris · commit 5ac69cbd5e7e · 2013-02-19T17:33:59.000-08:00
Master integration
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -43,16 +43,16 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
   INCLUDE(CheckCXXCompilerFlag)
   CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
   if (HAVE_STD11)
-    set(CMAKE_CXX_FLAGS -std=c++11 -Wall)
+    list(APPEND CMAKE_CXX_FLAGS "-std=c++11 -Wall")
   else()
     message(FATAL_ERROR "No advanced standard C++ support (-std=c++11 not defined).")
   endif()
 elseif(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
   INCLUDE(CheckCXXCompilerFlag)
   CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
   if (HAVE_STD11)
-    set(CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++ -Wall")
-    set(CMAKE_CXX_LINK_FLAGS "-std=c++11 -stdlib=libc++")
+    list(APPEND CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++ -Wall")
+    list(APPEND CMAKE_CXX_LINK_FLAGS "-std=c++11 -stdlib=libc++")
   else()
     message(FATAL_ERROR "No C++11 support for Clang version. Please upgrade Clang to a version supporting C++11.")
   endif()
diff --git a/http/test/CMakeLists.txt b/http/test/CMakeLists.txt
@@ -83,7 +83,8 @@ if (CPP-NETLIB_BUILD_TESTS)
         cppnetlib-http-message
         cppnetlib-http-message-wrappers
         cppnetlib-http-client
-        cppnetlib-http-client-connections)
+        cppnetlib-http-client-connections
+        cppnetlib-logging)
     if (OPENSSL_FOUND)
         target_link_libraries(cpp-netlib-http-client_test ${OPENSSL_LIBRARIES})
     endif()
