Commit5953b8c

Dean Michael Berris

committed

Re-ordering OpenSSL library linking in preparation for non-required OpenSSL.

1 parent7988d51 commit5953b8cCopy full SHA for 5953b8c

File tree

1 file changed

+23

-10

lines changed

libs/network/test
- CMakeLists.txt

1 file changed

+23

-10

lines changed

`‎libs/network/test/CMakeLists.txt`

Lines changed: 23 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,9 @@`
`6`	`6`	`include_directories(${CPP-NETLIB_SOURCE_DIR})`
`7`	`7`	`find_package(Boost1.41.0COMPONENTSunit_test_frameworksystemregexdate_timethreadfilesystem )`
`8`	`8`	`find_package(OpenSSL )`
`9`		`-include_directories(${OPENSSL_INCLUDE_DIR})`
	`9`	`+if (OPENSSL_FOUND)`
	`10`	`+include_directories(${OPENSSL_INCLUDE_DIR}})`
	`11`	`+endif()`
`10`	`12`	`find_package(Threads )`
`11`	`13`	`set(Boost_USE_STATIC_LIBSON)`
`12`	`14`	`set(Boost_USE_MULTITHREADEDON)`
`@@ -21,15 +23,26 @@ if (Boost_FOUND)`
`21`	`23`	`add_executable(cpp-netlib-http_message_testhttp_message_test.cpp)`
`22`	`24`	`add_executable(cpp-netlib-message_transform_testmessage_transform_test.cpp)`
`23`	`25`	`add_executable(cpp-netlib-url_testurl_test.cpp)`
`24`		`-target_link_libraries(cpp-netlib-hello_world${Boost_SYSTEM_LIBRARY}${Boost_REGEX_LIBRARY}${Boost_DATE_TIME_LIBRARY}${Boost_THREAD_LIBRARY}${CMAKE_THREAD_LIBS_INIT}${OPENSSL_LIBRARIES} )`
`25`		`-target_link_libraries(cpp-netlib-http_1_0_test${Boost_LIBRARIES}${OPENSSL_LIBRARIES}${CMAKE_THREAD_LIBS_INIT}${OPENSSL_LIBRARIES})`
`26`		`-target_link_libraries(cpp-netlib-http_1_1_test${Boost_LIBRARIES}${OPENSSL_LIBRARIES})`
`27`		`-target_link_libraries(cpp-netlib-http_message_test${Boost_LIBRARIES}${OPENSSL_LIBRARIES})`
`28`		`-target_link_libraries(cpp-netlib-message_test${Boost_LIBRARIES}${OPENSSL_LIBRARIES})`
`29`		`-target_link_libraries(cpp-netlib-message_transform_test${Boost_LIBRARIES}${OPENSSL_LIBRARIES})`
`30`		`-target_link_libraries(cpp-netlib-http_localhost_tests${Boost_LIBRARIES}${OPENSSL_LIBRARIES})`
`31`		`-target_link_libraries(cpp-netlib-https_localhost_tests${Boost_LIBRARIES}${OPENSSL_LIBRARIES})`
`32`		`-target_link_libraries(cpp-netlib-url_test${Boost_LIBRARIES}${OPENSSL_LIBRARIES})`
	`26`	`+target_link_libraries(cpp-netlib-hello_world${Boost_SYSTEM_LIBRARY}${Boost_REGEX_LIBRARY}${Boost_DATE_TIME_LIBRARY}${Boost_THREAD_LIBRARY}${CMAKE_THREAD_LIBS_INIT})`
	`27`	`+target_link_libraries(cpp-netlib-http_1_0_test${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})`
	`28`	`+target_link_libraries(cpp-netlib-http_1_1_test${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})`
	`29`	`+target_link_libraries(cpp-netlib-http_message_test${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})`
	`30`	`+target_link_libraries(cpp-netlib-message_test${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})`
	`31`	`+target_link_libraries(cpp-netlib-message_transform_test${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})`
	`32`	`+target_link_libraries(cpp-netlib-http_localhost_tests${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})`
	`33`	`+target_link_libraries(cpp-netlib-https_localhost_tests${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})`
	`34`	`+target_link_libraries(cpp-netlib-url_test${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})`
	`35`	`+ if (OPENSSL_FOUND)`
	`36`	`+target_link_libraries(cpp-netlib-hello_world${OPENSSL_LIBRARIES})`
	`37`	`+target_link_libraries(cpp-netlib-http_1_0_test${OPENSSL_LIBRARIES})`
	`38`	`+target_link_libraries(cpp-netlib-http_1_1_test${OPENSSL_LIBRARIES})`
	`39`	`+target_link_libraries(cpp-netlib-http_message_test${OPENSSL_LIBRARIES} )`
	`40`	`+target_link_libraries(cpp-netlib-message_test${OPENSSL_LIBRARIES} )`
	`41`	`+target_link_libraries(cpp-netlib-message_transform_test${OPENSSL_LIBRARIES} )`
	`42`	`+target_link_libraries(cpp-netlib-http_localhost_tests${OPENSSL_LIBRARIES} )`
	`43`	`+target_link_libraries(cpp-netlib-https_localhost_tests${OPENSSL_LIBRARIES} )`
	`44`	`+target_link_libraries(cpp-netlib-url_test${OPENSSL_LIBRARIES} )`
	`45`	`+ endif()`
`33`	`46`	`set_target_properties(cpp-netlib-hello_worldcpp-netlib-http_1_0_testcpp-netlib-http_1_1_testcpp-netlib-message_testcpp-netlib-http_message_testcpp-netlib-message_transform_testcpp-netlib-http_localhost_testscpp-netlib-https_localhost_testscpp-netlib-url_testPROPERTIESRUNTIME_OUTPUT_DIRECTORY../../../build/tests)`
`34`	`47`	`add_test(cpp-netlib-hello_worldpythonhttplib_acceptance.py../../../build/tests/cpp-netlib-hello_world../../../build/tests/cpp-netlib-hello_world.passed)`
`35`	`48`	`add_test(cpp-netlib-http_1_0_test../../../build/tests/cpp-netlib-http_1_0_test)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit5953b8c

File tree

1 file changed

1 file changed

`‎libs/network/test/CMakeLists.txt`

0 commit comments