in cmake, make PANDORA option force the BFS option to false

This commit is contained in:
Chris Beck 2014-10-25 19:23:28 -04:00
parent 48217f8da0
commit 419f154f42
2 changed files with 4 additions and 4 deletions

View file

@ -83,7 +83,7 @@ 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" OFF)
option(ENABLE_PANDORA "Add support for the OpenPandora by deactivating libvorbis support and boost filesystem support, this overrides the boost filesystem option below" 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)

View file

@ -227,19 +227,19 @@ set(libwesnoth-core_STAT_SRC
serialization/validator.cpp
)
if(ENABLE_BOOST_FILESYSTEM)
if(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
set(libwesnoth-core_STAT_SRC
${libwesnoth-core_STAT_SRC}
filesystem_boost.cpp
gettext_boost.cpp
)
else(ENABLE_BOOST_FILESYSTEM)
else(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
set(libwesnoth-core_STAT_SRC
${libwesnoth-game_STAT_SRC}
filesystem.cpp
gettext.cpp
)
endif(ENABLE_BOOST_FILESYSTEM)
endif(ENABLE_BOOST_FILESYSTEM AND 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