Commit4d424b8

committed

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

1 parente7bfb97 commit4d424b8Copy full SHA for 4d424b8

File tree

+14

-3

lines changed

+14

-3

lines changed

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,18 @@`
`3`	`3`	`# (See accompanying file LICENSE_1_0.txt or copy at`
`4`	`4`	`# http://www.boost.org/LICENSE_1_0.txt)`
`5`	`5`
	`6`	`+if (${CMAKE_CXX_COMPILER_ID}MATCHES GNU)`
	`7`	`+ if (HAVE_STD11)`
	`8`	`+ set(CPP-NETLIB_CXXFLAGS"-Wall -std=c++11")`
	`9`	`+ elseif (HAVE_STD0X)`
	`10`	`+ set(CPP-NETLIB_CXXFLAGS"-Wall -std=c++0x")`
	`11`	`+ endif()`
	`12`	`+elseif (${CMAKE_CXX_COMPILER_ID}MATCHES Clang)`
	`13`	`+ CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)`
	`14`	`+ set(CPP-NETLIB_CXXFLAGS"-Wall -std=c++11 -stdlib=libc++")`
	`15`	`+ set(CPP-NETLIB_CXXFLAGS"-Wall -std=c++11 -stdlib=libc++")`
	`16`	`+endif()`
	`17`	`+`
`6`	`18`	`include_directories(${CPP-NETLIB_SOURCE_DIR}/uri/src)`
`7`	`19`	`set(CPP-NETLIB_URI_SRCS uri.cpp schemes.cpp normalize.cpp)`
`8`	`20`	`add_library(cppnetlib-uri ${CPP-NETLIB_URI_SRCS})`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`
`6`	`6`
`7`	`7`	`#include_directories(${GTEST_INCLUDE_DIRS})`
	`8`	`+include_directories(${CPP-NETLIB_SOURCE_DIR}/uri/src)`
`8`	`9`
`9`	`10`	`if (Boost_FOUND)`
`10`	`11`	`set(`
`@@ -20,10 +21,8 @@ if (Boost_FOUND)`
`20`	`21`	`endif()`
`21`	`22`	`add_executable(cpp-netlib-${test}${test}.cpp)`
`22`	`23`	`add_dependencies(cpp-netlib-${test} cppnetlib-uri)`
`23`		`- message(STATUS${Boost_FOUND})`
`24`		`- message(STATUS${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})`
`25`	`24`	`target_link_libraries(cpp-netlib-${test}`
`26`		`-${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)`
	`25`	`+${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}${Boost_SYSTEM_LIBRARY}${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)`
`27`	`26`	`if (OPENSSL_FOUND)`
`28`	`27`	`target_link_libraries(cpp-netlib-${test}${OPENSSL_LIBRARIES})`
`29`	`28`	`endif()`

Comments

(0)