Commit2e5b039

committed

Merge pull request#326 from deanberris/0.10-devel

Preparation for 0.11 release.

2 parentse757294 +ce12fbe commit2e5b039Copy full SHA for 2e5b039

File tree

+11

-13

lines changed

+11

-13

lines changed

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ else()`
`37`	`37`	`endif()`
`38`	`38`
`39`	`39`	`set(Boost_USE_MULTI_THREADEDON)`
`40`		`-find_package(Boost1.45.0REQUIREDunit_test_frameworksystemregexdate_timethreadfilesystemprogram_optionschrono )`
	`40`	`+find_package(Boost1.54.0REQUIREDunit_test_frameworksystemregexdate_timethreadfilesystemprogram_optionschrono )`
`41`	`41`	`find_package(OpenSSL )`
`42`	`42`	`find_package(Threads )`
`43`	`43`	`set(CMAKE_VERBOSE_MAKEFILEtrue)`
`@@ -58,8 +58,18 @@ endif()`
`58`	`58`
`59`	`59`	`if (${CMAKE_CXX_COMPILER_ID}MATCHESGNU)`
`60`	`60`	`set (CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} -Wall")`
	`61`	`+elseif (${CMAKE_CXX_COMPILER_ID}MATCHESClang)`
	`62`	`+ if (${CMAKE_SYSTEM_NAME}MATCHES"Darwin")`
	`63`	`+# We want to link in C++11 mode if we're using Clang and on OS X.`
	`64`	`+set (CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} -Wall -ftemplate-depth=256 -std=c++11 -stdlib=libc++")`
	`65`	`+ else()`
	`66`	`+# We just add the -Wall and a high enough template depth`
	`67`	`+# flag for Clang in other systems.`
	`68`	`+set (CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} -Wall -ftemplate-dempth=256")`
	`69`	`+ endif()`
`61`	`70`	`endif()`
`62`	`71`
	`72`	`+`
`63`	`73`	`if (Boost_FOUND)`
`64`	`74`	`if (MSVC)`
`65`	`75`	`add_definitions(-D_SCL_SECURE_NO_WARNINGS)`

Lines changed: 0 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,6 @@ if (Boost_FOUND)`
`17`	`17`	`request_linearize_test`
`18`	`18`	`)`
`19`	`19`	`foreach (test${TESTS} )`
`20`		`- if (${CMAKE_CXX_COMPILER_ID}MATCHESGNU)`
`21`		`-set_source_files_properties(${test}.cpp`
`22`		`-PROPERTIESCOMPILE_FLAGS"-Wall")`
`23`		`- endif()`
`24`	`20`	`add_executable(cpp-netlib-http-${test}${test}.cpp)`
`25`	`21`	`add_dependencies(cpp-netlib-http-${test}`
`26`	`22`	`cppnetlib-uri)`
`@@ -43,10 +39,6 @@ if (Boost_FOUND)`
`43`	`39`	`client_get_streaming_test`
`44`	`40`	`)`
`45`	`41`	`foreach (test${TESTS} )`
`46`		`- if (${CMAKE_CXX_COMPILER_ID}MATCHESGNU)`
`47`		`-set_source_files_properties(${test}.cpp`
`48`		`-PROPERTIESCOMPILE_FLAGS"-Wall")`
`49`		`- endif()`
`50`	`42`	`add_executable(cpp-netlib-http-${test}${test}.cpp)`
`51`	`43`	`add_dependencies(cpp-netlib-http-${test}`
`52`	`44`	`cppnetlib-uri`
`@@ -72,10 +64,6 @@ if (Boost_FOUND)`
`72`	`64`	`server_async_run_stop_concurrency`
`73`	`65`	`)`
`74`	`66`	`foreach (test${SERVER_API_TESTS} )`
`75`		`- if (${CMAKE_CXX_COMPILER_ID}MATCHESGNU)`
`76`		`-set_source_files_properties(${test}.cpp`
`77`		`-PROPERTIESCOMPILE_FLAGS"-Wall")`
`78`		`- endif()`
`79`	`67`	`add_executable(cpp-netlib-http-${test}${test}.cpp)`
`80`	`68`	`add_dependencies(cpp-netlib-http-${test}cppnetlib-server-parsers)`
`81`	`69`	`target_link_libraries(cpp-netlib-http-${test}${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT}cppnetlib-server-parsers)`

Comments

(0)