Author: mordante
Date: Sat Apr 25 18:48:06 2009
New Revision: 35202
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35202&view=rev
Log:
Avoid double linking of boost on MSVC.
The MSVC part has been tested by Reisiger.
Modified:
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/CMakeLists.txt?rev=35202&r1=35201&r2=35202&view=diff
==============================================================================
--- trunk/src/CMakeLists.txt (original)
+++ trunk/src/CMakeLists.txt Sat Apr 25 18:48:06 2009
@@ -30,11 +30,19 @@
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}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
