Fixing linker dependencies.

deanberris · deanberris · commit 55974d10bf81 · 2010-01-22T03:50:37.000+08:00
This is to support the additional requirement to link against libcrypto on an updated Ubuntu. This may be because of a change in the later version of libssl (OpenSSL).
diff --git a/libs/network/test/CMakeLists.txt b/libs/network/test/CMakeLists.txt
@@ -14,14 +14,14 @@ if (Boost_FOUND)
     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} pthread)
-    target_link_libraries(cpp-netlib-http_1_0_test ${Boost_LIBRARIES} pthread ssl)
-    target_link_libraries(cpp-netlib-http_1_1_test ${Boost_LIBRARIES} pthread ssl)
-    target_link_libraries(cpp-netlib-http_message_test ${Boost_LIBRARIES} pthread ssl)
-    target_link_libraries(cpp-netlib-message_test ${Boost_LIBRARIES} pthread ssl)
-    target_link_libraries(cpp-netlib-message_transform_test ${Boost_LIBRARIES} pthread ssl)
-    target_link_libraries(cpp-netlib-http_localhost_tests ${Boost_LIBRARIES} pthread ssl)
-    target_link_libraries(cpp-netlib-https_localhost_tests ${Boost_LIBRARIES} pthread ssl)
-    target_link_libraries(cpp-netlib-url_test ${Boost_LIBRARIES} pthread ssl)
+    target_link_libraries(cpp-netlib-http_1_0_test ${Boost_LIBRARIES} pthread ssl crypto)
+    target_link_libraries(cpp-netlib-http_1_1_test ${Boost_LIBRARIES} pthread ssl crypto)
+    target_link_libraries(cpp-netlib-http_message_test ${Boost_LIBRARIES} pthread ssl crypto)
+    target_link_libraries(cpp-netlib-message_test ${Boost_LIBRARIES} pthread ssl crypto)
+    target_link_libraries(cpp-netlib-message_transform_test ${Boost_LIBRARIES} pthread ssl crypto)
+    target_link_libraries(cpp-netlib-http_localhost_tests ${Boost_LIBRARIES} pthread ssl crypto)
+    target_link_libraries(cpp-netlib-https_localhost_tests ${Boost_LIBRARIES} pthread ssl crypto)
+    target_link_libraries(cpp-netlib-url_test ${Boost_LIBRARIES} pthread ssl crypto)
     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)
diff --git a/libs/network/test/Jamfile.v2 b/libs/network/test/Jamfile.v2
@@ -23,6 +23,7 @@ project network_test :
         <source>/boost//filesystem
         <toolset>gcc:<linkflags>-lpthread
         <toolset>gcc:<linkflags>-lssl
+        <toolset>gcc:<linkflags>-lcrypto
         <os>cygwin,<toolset>gcc:<define>_WIN32_WINNT=0x0501
         <os>cygwin,<toolset>gcc:<define>__USE_W32_SOCKETS
         <os>cygwin,<toolset>gcc:<library>ws2_32
@@ -35,21 +36,13 @@ project network_test :
     ;
 
 unit-test http_localhost_tests : http_localhost_tests.cpp ;
-
 unit-test https_localhost_tests : https_localhost_tests.cpp ;
-
 unit-test message_test : message_test.cpp ;
-
 unit-test message_transform_test : message_transform_test.cpp ;
-
 unit-test http_1_0_test : http_1_0_test.cpp ;
-
 unit-test http_1_1_test : http_1_1_test.cpp ;
-
 unit-test http_message_test : http_message_test.cpp ;
-
 unit-test url_test : url_test.cpp ;
-
 exe hello_world : hello_world.cpp ;
 
 make httplib_acceptance.passed : httplib_acceptance.py hello_world : @python_runner ;
