fly/flightgear
1
0
Fork 0
Code Activity

Olaf Flebbe: Removed Boost serialization linkage on MSVC

Browse source
This commit is contained in:
James Turner 2011-01-03 09:50:05 +00:00
parent 2cb67b06b7
commit 6d3773cb40
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -86,17 +86,7 @@ endif (MSVC_3RDPARTY_DIR)
# check required dependencies # check required dependencies
if (MSVC) find_package(Boost REQUIRED)
# 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(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)

3
src/Main/CMakeLists.txt
View file

@ -39,7 +39,6 @@ target_link_libraries(fgfs
${ALUT_LIBRARY} ${ALUT_LIBRARY}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${PLIB_LIBRARIES} ${PLIB_LIBRARIES}
${RT_LIBRARY} ${RT_LIBRARY})
${Boost_SERIALIZATION_LIBRARY})
install(TARGETS fgfs RUNTIME DESTINATION bin) install(TARGETS fgfs RUNTIME DESTINATION bin)