From 419f154f424848856a83e2828183d15406ef6369 Mon Sep 17 00:00:00 2001 From: Chris Beck Date: Sat, 25 Oct 2014 19:23:28 -0400 Subject: [PATCH] in cmake, make PANDORA option force the BFS option to false --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c7dfb54fc0e..7a299bc04af2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ea185013998c..5203615131fe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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