Fixed CMake scripts for MSVC 10.0

glynos · glynos · commit e2c257ffbc1f · 2011-12-06T23:18:50.000+01:00
diff --git a/libs/network/example/CMakeLists.txt b/libs/network/example/CMakeLists.txt
@@ -11,19 +11,24 @@ endif (OPENSSL_FOUND)
 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)
+if (UNIX)
+  add_executable(fileserver http/fileserver.cpp)
+endif (UNIX)
 add_executable(uri uri.cpp)
 add_dependencies(http_client cppnetlib-uri cppnetlib-client-connections)
 add_dependencies(simple_wget cppnetlib-uri cppnetlib-client-connections)
 add_dependencies(uri cppnetlib-uri)
 set(BOOST_CLIENT_LIBS
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
     ${Boost_THREAD_LIBRARY}
+    ${Boost_DATE_TIME_LIBRARY}
+    ${Boost_REGEX_LIBRARY}
     ${Boost_SYSTEM_LIBRARY})
 
 set(BOOST_SERVER_LIBS
     ${Boost_THREAD_LIBRARY}
     ${Boost_SYSTEM_LIBRARY}
+    ${Boost_DATE_TIME_LIBRARY}
     ${Boost_PROGRAM_OPTIONS_LIBRARY})
 
 target_link_libraries(http_client
@@ -48,15 +53,19 @@ if (OPENSSL_FOUND)
   target_link_libraries(hello_world_server ${OPENSSL_LIBRARIES})
 endif (OPENSSL_FOUND)
 
-target_link_libraries(fileserver
+if (UNIX)
+  target_link_libraries(fileserver
     ${BOOST_SERVER_LIBS}
     ${Boost_FILESYSTEM_LIBRARY}
     ${CMAKE_THREAD_LIBS_INIT}
     cppnetlib-server-parsers)
+endif (UNIX)
 
 target_link_libraries(uri cppnetlib-uri)
 set_target_properties(http_client PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
 set_target_properties(simple_wget PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
 set_target_properties(hello_world_server PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
-set_target_properties(fileserver PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
+if (UNIX)
+  set_target_properties(fileserver PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
+endif (UNIX)
 set_target_properties(uri PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
diff --git a/libs/network/test/http/CMakeLists.txt b/libs/network/test/http/CMakeLists.txt
@@ -13,10 +13,6 @@ if (OPENSSL_FOUND)
 endif()
 
 if (Boost_FOUND)
-    set ( BOOST_LIBS
-        ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
-        ${Boost_THREAD_LIBRARY}
-        ${Boost_SYSTEM_LIBRARY})
     set ( TESTS
         client_constructor_test
         client_get_test
@@ -34,7 +30,7 @@ if (Boost_FOUND)
             cppnetlib-uri
             cppnetlib-client-connections)
         target_link_libraries(cpp-netlib-http-${test}
-            ${BOOST_LIBS} ${CMAKE_THREAD_LIBS_INIT}
+            ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
             cppnetlib-uri
             cppnetlib-client-connections)
         if (OPENSSL_FOUND)
@@ -57,7 +53,7 @@ if (Boost_FOUND)
         endif()
         add_executable(cpp-netlib-http-${test} ${test}.cpp)
         add_dependencies(cpp-netlib-http-${test} cppnetlib-server-parsers)
-        target_link_libraries(cpp-netlib-http-${test} ${BOOST_LIBS} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-server-parsers)
+        target_link_libraries(cpp-netlib-http-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-server-parsers)
         set_target_properties(cpp-netlib-http-${test}
             PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
         add_test(cpp-netlib-http-${test}
@@ -78,7 +74,7 @@ if (Boost_FOUND)
     #     endif()
     #     add_executable(cpp-netlib-http-${test} ${test}.cpp)
     #     add_dependencies(cpp-netlib-http-${test} cppnetlib-server-parsers)
-    #     target_link_libraries(cpp-netlib-http-${test} ${BOOST_LIBS} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-server-parsers)
+    #     target_link_libraries(cpp-netlib-http-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-server-parsers)
     #     set_target_properties(cpp-netlib-http-${test}
     #       PROPERTIES RUNTIME_OUTPUT_DIRECTORY
     #       ${CPP-NETLIB_BINARY_DIR}/tests)
