Final tweaks to get things going again.

deanberris · deanberris · commit 7e21d0f8c705 · 2011-12-05T19:28:32.000+11:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ if (CMAKE_BUILD_TYPE MATCHES Debug)
     add_definitions(-DBOOST_NETWORK_DEBUG)
 endif()
 
-if (OpenSSL_FOUND)
+if (OPENSSL_FOUND)
     add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)
 endif()
 
diff --git a/libs/network/example/CMakeLists.txt b/libs/network/example/CMakeLists.txt
@@ -6,17 +6,13 @@
 include_directories(${CPP-NETLIB_SOURCE_DIR})
 include_directories(${OPENSSL_INCLUDE_DIR})
 
-if (OPENSSL_FOUND)
-    add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)
-endif()
-
 add_executable(http_client http_client.cpp)
 add_executable(simple_wget simple_wget.cpp)
 add_executable(hello_world_server http/hello_world_server.cpp)
 add_executable(fileserver http/fileserver.cpp)
 add_executable(uri uri.cpp)
-add_dependencies(http_client cppnetlib-uri-parsers)
-add_dependencies(simple_wget cppnetlib-uri-parsers)
+add_dependencies(http_client cppnetlib-uri-parsers cppnetlib-client-connections)
+add_dependencies(simple_wget cppnetlib-uri-parsers cppnetlib-client-connections)
 add_dependencies(uri cppnetlib-uri-parsers)
 set(BOOST_CLIENT_LIBS
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
@@ -32,13 +28,15 @@ target_link_libraries(http_client
     ${BOOST_CLIENT_LIBS}
     ${CMAKE_THREAD_LIBS_INIT}
     ${OPENSSL_LIBRARIES}
-    cppnetlib-uri-parsers)
+    cppnetlib-uri-parsers
+    cppnetlib-client-connections)
 
 target_link_libraries(simple_wget
     ${BOOST_CLIENT_LIBS}
     ${CMAKE_THREAD_LIBS_INIT}
     ${OPENSSL_LIBRARIES}
-    cppnetlib-uri-parsers)
+    cppnetlib-uri-parsers
+    cppnetlib-client-connections)
 
 target_link_libraries(hello_world_server
     ${BOOST_SERVER_LIBS}
diff --git a/libs/network/src/CMakeLists.txt b/libs/network/src/CMakeLists.txt
@@ -8,10 +8,6 @@
 
 include_directories(${CPP-NETLIB_SOURCE_DIR})
 
-if (OPENSSL_FOUND)
-    add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)
-endif()
-
 set(CPP-NETLIB_URI_SRCS uri/parse.cpp)
 add_library(cppnetlib-uri-parsers ${CPP-NETLIB_URI_SRCS})
 
diff --git a/libs/network/test/http/CMakeLists.txt b/libs/network/test/http/CMakeLists.txt
@@ -29,8 +29,13 @@ if (Boost_FOUND)
                 PROPERTIES COMPILE_FLAGS "-Wall")
         endif()
         add_executable(cpp-netlib-http-${test} ${test}.cpp)
-        add_dependencies(cpp-netlib-http-${test} cppnetlib-uri-parsers)
-        target_link_libraries(cpp-netlib-http-${test} ${BOOST_LIBS} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)
+        add_dependencies(cpp-netlib-http-${test}
+            cppnetlib-uri-parsers
+            cppnetlib-client-connections)
+        target_link_libraries(cpp-netlib-http-${test}
+            ${BOOST_LIBS} ${CMAKE_THREAD_LIBS_INIT}
+            cppnetlib-uri-parsers
+            cppnetlib-client-connections)
         if (OPENSSL_FOUND)
             target_link_libraries(cpp-netlib-http-${test} ${OPENSSL_LIBRARIES})
         endif()
