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

cmake: Remove ENABLE_BOOST_FILESYSTEM option

Browse source 
See commit c62d53239c for the SCons
counterpart.

This does *not* remove the ENABLE_PANDORA config-time requirement
exceptions, which we need to decide on before releasing 1.13.0.
This commit is contained in:
Ignacio R. Morelle 2015-04-11 23:47:03 -03:00
parent a5d3c64d10
commit fe64aa9fda
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

@ -86,9 +86,8 @@ option(ENABLE_TESTS "Build unit tests")
option(ENABLE_NLS "Enable building of translations" ON)
option(ENABLE_LOW_MEM "Reduce memory usage by removing extra functionality" OFF)
option(ENABLE_OMP "Enables OpenMP, and has additional dependencies" OFF)
option(ENABLE_PANDORA "Add support for the OpenPandora by deactivating libvorbis support and boost filesystem support, this overrides the boost filesystem option below. This also reduces the SDL_mixer dependency to 1.2 rather than 1.2.12." OFF)
option(ENABLE_PANDORA "Add support for the OpenPandora by deactivating libvorbis support and boost filesystem support. This also reduces the SDL_mixer dependency to 1.2 rather than 1.2.12." OFF)
option(ENABLE_SDL_GPU "Enable building with SDL_gpu (experimental" OFF)
option(ENABLE_BOOST_FILESYSTEM "Enable building with the boost filesystem and boost locale code" ON)
option(ENABLE_LIBPNG "Enable support for writing png files (screenshots, images)" ON)
#option(ENABLE_HISTORY "Enable using GNU history for history in lua console" ON) -- This feature is not supported in cmake yet, there is no cmake script to find the lib
@ -599,10 +598,10 @@ if(ENABLE_GAME)
unset(LIBDBUS_FOUND CACHE)
endif()
if(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
if(NOT ENABLE_PANDORA)
find_package( Boost 1.44 REQUIRED COMPONENTS filesystem )
find_package( Boost 1.48 REQUIRED COMPONENTS locale )
endif(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
endif(NOT ENABLE_PANDORA)
find_package( PNG )
if(ENABLE_LIBPNG AND PNG_FOUND)
@ -620,10 +619,10 @@ if(ENABLE_GAME)
endif(ENABLE_GAME)
if(ENABLE_SERVER)
if(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
if(NOT ENABLE_PANDORA)
find_package( Boost 1.44 REQUIRED COMPONENTS filesystem )
find_package( Boost 1.48 REQUIRED COMPONENTS locale )
endif(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
endif(NOT ENABLE_PANDORA)
endif(ENABLE_SERVER)
if(ENABLE_POT_UPDATE_TARGET)

12
src/CMakeLists.txt
View file

@ -93,18 +93,18 @@ else(MSVC)
)
endif(MSVC)
if(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
if(NOT ENABLE_PANDORA)
set(common-external-libs
${common-external-libs}
${Boost_FILESYSTEM_LIBRARY}
${Boost_LOCALE_LIBRARY}
)
else(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
else(NOT ENABLE_PANDORA)
set(common-external-libs
${common-external-libs}
${LIBINTL_LIBRARY}
)
endif(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
endif(NOT ENABLE_PANDORA)
set(game-external-libs
${common-external-libs}
@ -255,19 +255,19 @@ set(libwesnoth-core_STAT_SRC
serialization/validator.cpp
)
if(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
if(NOT ENABLE_PANDORA)
set(libwesnoth-core_STAT_SRC
${libwesnoth-core_STAT_SRC}
filesystem_boost.cpp
gettext_boost.cpp
)
else(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
else(NOT ENABLE_PANDORA)
set(libwesnoth-core_STAT_SRC
${libwesnoth-core_STAT_SRC}
filesystem.cpp
gettext.cpp
)
endif(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
endif(NOT ENABLE_PANDORA)
# a 'lib' is automatically set in front when creating the library (as in the filename)
# internal reference is the name given here