Merge pull request #193 from CovenantEyes/0.9-devel

deanberris · deanberris · commit f3d9bdc8ab7a · 2013-01-24T04:50:31.000-08:00
Add needed Boost libs and OpenSSL headers to CMake config
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.8)
 project(CPP-NETLIB)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTI_THREADED ON)
-find_package( Boost 1.45.0 REQUIRED unit_test_framework system regex date_time thread filesystem program_options )
+find_package( Boost 1.45.0 REQUIRED unit_test_framework system regex date_time thread filesystem program_options chrono )
 find_package( OpenSSL )
 find_package( Threads )
 set(CMAKE_VERBOSE_MAKEFILE true)
@@ -18,6 +18,7 @@ endif()
 
 if (OPENSSL_FOUND)
     add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)
+    include_directories(${OPENSSL_INCLUDE_DIR})
 endif()
 
 if (Boost_FOUND)
@@ -37,4 +38,8 @@ if (Boost_FOUND)
     add_subdirectory(libs/network/example)
 endif(Boost_FOUND)
 
+if (MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+endif()
+
 enable_testing()
diff --git a/libs/network/example/CMakeLists.txt b/libs/network/example/CMakeLists.txt
@@ -28,13 +28,17 @@ set(BOOST_CLIENT_LIBS
     ${Boost_THREAD_LIBRARY}
     ${Boost_DATE_TIME_LIBRARY}
     ${Boost_REGEX_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY})
+    ${Boost_SYSTEM_LIBRARY}
+    ${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_CHRONO_LIBRARY})
 
 set(BOOST_SERVER_LIBS
     ${Boost_THREAD_LIBRARY}
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_DATE_TIME_LIBRARY}
-    ${Boost_PROGRAM_OPTIONS_LIBRARY})
+    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+    ${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_CHRONO_LIBRARY})
 
 target_link_libraries(http_client
     ${BOOST_CLIENT_LIBS}
