Applied some fixes to the build scripts (#131)

glynos · glynos · commit a4dabd50dcd4 · 2012-07-30T21:27:22.000+02:00
diff --git a/libs/network/example/CMakeLists.txt b/libs/network/example/CMakeLists.txt
@@ -20,21 +20,23 @@ add_executable(hello_world_client http/hello_world_client.cpp)
 #  add_executable(fileserver http/fileserver.cpp)
 #endif (UNIX)
 set(BOOST_CLIENT_LIBS
-    ${Boost_PROGRAM_OPTIONS_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
     ${Boost_CHRONO_LIBRARY}
     ${Boost_DATE_TIME_LIBRARY}
-    ${Boost_REGEX_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
 	${Boost_FILESYSTEM_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY})
-
-set(BOOST_SERVER_LIBS
+    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+    ${Boost_REGEX_LIBRARY}
     ${Boost_THREAD_LIBRARY}
+	)
+set(BOOST_SERVER_LIBS
     ${Boost_CHRONO_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
     ${Boost_DATE_TIME_LIBRARY}
-    ${Boost_PROGRAM_OPTIONS_LIBRARY})
-
+    ${Boost_SYSTEM_LIBRARY}
+	${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+    ${Boost_THREAD_LIBRARY}
+	)
+	
 target_link_libraries(uri_builder
     ${BOOST_CLIENT_LIBS}
     ${CMAKE_THREAD_LIBS_INIT}
diff --git a/libs/network/src/CMakeLists.txt b/libs/network/src/CMakeLists.txt
@@ -8,6 +8,9 @@
 
 include_directories(${CPP-NETLIB_SOURCE_DIR}/include)
 include_directories(${CPP-NETLIB_SOURCE_DIR})
+if (OPENSSL_FOUND)
+include_directories(${OPENSSL_INCLUDE_DIR})
+endif()
 
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
   if (HAVE_STD11)
diff --git a/libs/network/test/CMakeLists.txt b/libs/network/test/CMakeLists.txt
@@ -34,6 +34,7 @@ if (Boost_FOUND)
             cppnetlib-message-directives
             cppnetlib-message-wrappers)
         if (OPENSSL_FOUND)
+			include_directories(${OPENSSL_INCLUDE_DIR})
             target_link_libraries(cpp-netlib-${test} ${OPENSSL_LIBRARIES})
         endif()
         set_target_properties(cpp-netlib-${test}
