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

Dean Michael Berris · Dean Michael Berris · commit 5953b8c12ea7 · 2010-09-03T19:27:26.000+08:00
diff --git a/libs/network/test/CMakeLists.txt b/libs/network/test/CMakeLists.txt
@@ -6,7 +6,9 @@
 include_directories(${CPP-NETLIB_SOURCE_DIR})
 find_package( Boost 1.41.0 COMPONENTS unit_test_framework system regex date_time thread filesystem )
 find_package( OpenSSL )
-include_directories(${OPENSSL_INCLUDE_DIR})
+if (OPENSSL_FOUND)
+    include_directories(${OPENSSL_INCLUDE_DIR}})
+endif()
 find_package( Threads )
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
@@ -21,15 +23,26 @@ if (Boost_FOUND)
     add_executable(cpp-netlib-http_message_test http_message_test.cpp)
     add_executable(cpp-netlib-message_transform_test message_transform_test.cpp)
     add_executable(cpp-netlib-url_test url_test.cpp)
-    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} )
-    target_link_libraries(cpp-netlib-http_1_0_test ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES})
-    target_link_libraries(cpp-netlib-http_1_1_test ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES})
-    target_link_libraries(cpp-netlib-http_message_test ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES})
-    target_link_libraries(cpp-netlib-message_test ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES})
-    target_link_libraries(cpp-netlib-message_transform_test ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES})
-    target_link_libraries(cpp-netlib-http_localhost_tests ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES})
-    target_link_libraries(cpp-netlib-https_localhost_tests ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES})
-    target_link_libraries(cpp-netlib-url_test ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES})
+    target_link_libraries(cpp-netlib-hello_world ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_DATE_TIME_LIBRARY} ${Boost_THREAD_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+    target_link_libraries(cpp-netlib-http_1_0_test ${Boost_LIBRARIES}  ${CMAKE_THREAD_LIBS_INIT})
+    target_link_libraries(cpp-netlib-http_1_1_test ${Boost_LIBRARIES}  ${CMAKE_THREAD_LIBS_INIT})
+    target_link_libraries(cpp-netlib-http_message_test ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+    target_link_libraries(cpp-netlib-message_test ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+    target_link_libraries(cpp-netlib-message_transform_test ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+    target_link_libraries(cpp-netlib-http_localhost_tests ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+    target_link_libraries(cpp-netlib-https_localhost_tests ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+    target_link_libraries(cpp-netlib-url_test ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+    if (OPENSSL_FOUND)
+        target_link_libraries(cpp-netlib-hello_world ${OPENSSL_LIBRARIES})
+        target_link_libraries(cpp-netlib-http_1_0_test ${OPENSSL_LIBRARIES})
+        target_link_libraries(cpp-netlib-http_1_1_test ${OPENSSL_LIBRARIES})
+        target_link_libraries(cpp-netlib-http_message_test ${OPENSSL_LIBRARIES} )
+        target_link_libraries(cpp-netlib-message_test ${OPENSSL_LIBRARIES} )
+        target_link_libraries(cpp-netlib-message_transform_test ${OPENSSL_LIBRARIES} )
+        target_link_libraries(cpp-netlib-http_localhost_tests ${OPENSSL_LIBRARIES} )
+        target_link_libraries(cpp-netlib-https_localhost_tests ${OPENSSL_LIBRARIES} )
+        target_link_libraries(cpp-netlib-url_test ${OPENSSL_LIBRARIES} )
+    endif()
     set_target_properties(cpp-netlib-hello_world cpp-netlib-http_1_0_test cpp-netlib-http_1_1_test cpp-netlib-message_test cpp-netlib-http_message_test cpp-netlib-message_transform_test cpp-netlib-http_localhost_tests cpp-netlib-https_localhost_tests cpp-netlib-url_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../../../build/tests)
     add_test(cpp-netlib-hello_world python httplib_acceptance.py ../../../build/tests/cpp-netlib-hello_world ../../../build/tests/cpp-netlib-hello_world.passed)
     add_test(cpp-netlib-http_1_0_test ../../../build/tests/cpp-netlib-http_1_0_test)
