Updated build scripts for the restructured uri so that it compiles on Linux/GCC 4.7

glynos · glynos · commit 4d424b85fa0a · 2012-12-26T09:04:28.000+01:00
diff --git a/uri/src/CMakeLists.txt b/uri/src/CMakeLists.txt
@@ -3,6 +3,18 @@
 # (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)
+  if (HAVE_STD11)
+    set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
+  elseif (HAVE_STD0X)
+    set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++0x")
+  endif()
+elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
+  CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
+  set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
+  set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
+endif()
+
 include_directories(${CPP-NETLIB_SOURCE_DIR}/uri/src)
 set(CPP-NETLIB_URI_SRCS uri.cpp schemes.cpp normalize.cpp)
 add_library(cppnetlib-uri ${CPP-NETLIB_URI_SRCS})
diff --git a/uri/test/CMakeLists.txt b/uri/test/CMakeLists.txt
@@ -5,6 +5,7 @@
 
 
 #include_directories(${GTEST_INCLUDE_DIRS})
+include_directories(${CPP-NETLIB_SOURCE_DIR}/uri/src)
 
 if (Boost_FOUND)
   set(
@@ -20,10 +21,8 @@ if (Boost_FOUND)
     endif()
     add_executable(cpp-netlib-${test} ${test}.cpp)
     add_dependencies(cpp-netlib-${test} cppnetlib-uri)
-    message(STATUS ${Boost_FOUND})
-    message(STATUS ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
     target_link_libraries(cpp-netlib-${test}
-      ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)
+      ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)
     if (OPENSSL_FOUND)
       target_link_libraries(cpp-netlib-${test} ${OPENSSL_LIBRARIES})
     endif()
