0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make boost system mandatory for CMake.

Browse source 
This due to the work loonycyborg does on boost asio. Anonymissimus
please test whether it suffices on Windows.
This commit is contained in:
Mark de Wever 2011-06-19 12:05:19 +00:00
parent 34a571092b
commit 75be32120b
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -19,7 +19,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
find_package(SDL 1.2.7 REQUIRED)
find_package(Boost 1.35 REQUIRED COMPONENTS iostreams program_options regex)
find_package(Boost 1.35 REQUIRED COMPONENTS iostreams program_options regex system)
# no, gettext executables are not required when NLS is deactivated
find_package(Gettext)
@ -238,10 +238,6 @@ if(ENABLE_GAME)
endif(ENABLE_GAME)
if(USE_ANA_NETWORK)
find_package( Boost 1.35 REQUIRED COMPONENTS system )
endif(USE_ANA_NETWORK)
if(ENABLE_POT_UPDATE_TARGET)
find_package(TranslationTools REQUIRED)
endif(ENABLE_POT_UPDATE_TARGET)

6
src/CMakeLists.txt
View file

@ -76,6 +76,7 @@ endif(MSVC)
set(game-external-libs
${common-external-libs}
${Boost_SYSTEM_LIBRARIES}
${SDLIMAGE_LIBRARY}
${SDLMIXER_LIBRARY}
${ANA_LIBRARIES}
@ -94,11 +95,6 @@ if(MSVC)
${CAIRO_LIBRARY}
${GOBJECT_LIBRARY}
)
else(MSVC)
set(game-external-libs
${game-external-libs}
${Boost_SYSTEM_LIBRARIES}
)
endif(MSVC)
if(USE_ANA_NETWORK)