Olaf Flebbe: Removed Boost serialization linkage on MSVC

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fd7341f2c28310365d6cc71890af24583f83670..ab419fdfb5f500a2b957e76319f9a2ccb3da2324 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,17 +86,7 @@ endif (MSVC_3RDPARTY_DIR)
 
 
 # check required dependencies
-if (MSVC)
-    # on MSVC, Olaf reports that the serialization library is required at
-    # link time. No one has you explained why, unfortunately.
-    set(Boost_USE_STATIC_LIBS        ON)
-    set(Boost_USE_MULTITHREADED      ON)
-    set(Boost_USE_STATIC_RUNTIME    OFF)
-    find_package(Boost REQUIRED COMPONENTS serialization)
-else (MSVC)
-    find_package(Boost REQUIRED)
-endif (MSVC)
-
+find_package(Boost REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(Threads REQUIRED)
 find_package(OpenGL REQUIRED)

diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index 6eb4513c0da99371bf42d1a7be1d6ae0e0d7b561..ffc87c85782a03b586f2a123d17a64ea4db7023d 100644 (file)
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -39,7 +39,6 @@ target_link_libraries(fgfs
        ${ALUT_LIBRARY} 
        ${ZLIB_LIBRARIES}
        ${PLIB_LIBRARIES}
-       ${RT_LIBRARY}
-       ${Boost_SERIALIZATION_LIBRARY})
+       ${RT_LIBRARY})
        
 install(TARGETS fgfs RUNTIME DESTINATION bin)