Commit6aead42

committed

More CMakeLists twiddling.

1 parent01589b6 commit6aead42Copy full SHA for 6aead42

File tree

-13

lines changed

-13

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,12 @@ project(CPP-NETLIB)`
`8`	`8`	`find_package( Boost 1.43.0 REQUIRED unit_test_frameworksystemregex date_time thread filesystem )`
`9`	`9`	`find_package( OpenSSL )`
`10`	`10`	`find_package( Threads )`
`11`		`-set(Boost_USE_STATIC_LIBSON)`
`12`		`-set(Boost_USE_MULTITHREADEDON)`
`13`	`11`	`set(CMAKE_VERBOSE_MAKEFILEtrue)`
`14`	`12`
`15`	`13`	`if (CMAKE_BUILD_TYPEMATCHES Debug)`
`16`	`14`	`add_definitions(-DBOOST_NETWORK_DEBUG)`
`17`	`15`	`endif()`
`18`		`-`
	`16`	`+`
`19`	`17`	`if (Boost_FOUND)`
`20`	`18`	`set(Boost_USE_STATIC_LIBSON)`
`21`	`19`	`set(Boost_USE_MULTI_THREADEDON)`
`@@ -26,4 +24,3 @@ add_subdirectory(libs/network/src)`
`26`	`24`	`add_subdirectory(libs/network/test)`
`27`	`25`	`add_subdirectory(libs/mime/test)`
`28`	`26`	`add_subdirectory(libs/network/example)`
`29`		`-`

Lines changed: 5 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,6 @@`
`4`	`4`	`# http://www.boost.org/LICENSE_1_0.txt)`
`5`	`5`
`6`	`6`	`include_directories(${CPP-NETLIB_SOURCE_DIR})`
`7`		`-find_package( Boost 1.41.0 COMPONENTS unit_test_frameworksystemregex date_time filesystem )`
`8`		`-find_package( OpenSSL )`
`9`		`-find_package( Threads )`
`10`		`-set(Boost_USE_STATIC_LIBSON)`
`11`		`-set(Boost_USE_MULTITHREADEDON)`
`12`		`-`
`13`	`7`
`14`	`8`	`if (Boost_FOUND)`
`15`	`9`	`set(`
`@@ -22,14 +16,16 @@ if (Boost_FOUND)`
`22`	`16`	`set_source_files_properties(${test}.cpp`
`23`	`17`	`PROPERTIESCOMPILE_FLAGS"-Wall")`
`24`	`18`	`add_executable(cpp-netlib-${test}${test}.cpp)`
`25`		`-add_dependencies(cpp-netlib-${test} cppnetlib-uri-parsers)`
`26`		`- target_link_libraries(cpp-netlib-${test}${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)`
	`19`	`+ add_dependencies(cpp-netlib-${test} cppnetlib-uri-parsers)`
	`20`	`+ target_link_libraries(cpp-netlib-${test}`
	`21`	`+${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)`
`27`	`22`	`if (OPENSSL_FOUND)`
`28`	`23`	`target_link_libraries(cpp-netlib-${test}${OPENSSL_LIBRARIES})`
`29`	`24`	`endif()`
`30`	`25`	`set_target_properties(cpp-netlib-${test}`
`31`	`26`	`PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)`
`32`		`- add_test(cpp-netlib-${test} ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-${test})`
	`27`	`+ add_test(cpp-netlib-${test}`
	`28`	`+ ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-${test})`
`33`	`29`	`endforeach (test)`
`34`	`30`
`35`	`31`	`endif()`

Comments

(0)