upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-02 23:01:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid double linking of boost on MSVC.

Browse Source 
The MSVC part has been tested by Reisiger.
This commit is contained in:
Mark de Wever 2009-04-25 16:48:06 +00:00
parent 76aaea1bd4
commit fc9bc3b138
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/CMakeLists.txt
View File

@ -30,11 +30,19 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
link_directories(${Boost_LIBRARY_DIRS})
set( common-external-libs
${SDL_LIBRARY}
${Boost_IOSTREAMS_LIBRARY}
${Boost_REGEX_LIBRARY}
)
if(MSVC)
# Since MSVC does autolinking of boost adding those files will duplicate
# the includes and cause build errors.
set( common-external-libs
${SDL_LIBRARY}
)
else(MSVC)
set( common-external-libs
${SDL_LIBRARY}
${Boost_IOSTREAMS_LIBRARY}
${Boost_REGEX_LIBRARY}
)
endif(MSVC)
set( game-external-libs
${common-external-libs}