diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-27 20:53:28 +0100 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-27 20:54:04 +0100 |
| commit | 8301a3639be3ffbc6963206aa0634464d943229a (patch) | |
| tree | 08342784bae736d678afa758df7f2d3e14d0485f | |
| parent | 672abbbbca5bd12441a2e3ebca0d04bfa529e84f (diff) | |
| download | colobot-8301a3639be3ffbc6963206aa0634464d943229a.tar.gz colobot-8301a3639be3ffbc6963206aa0634464d943229a.tar.bz2 colobot-8301a3639be3ffbc6963206aa0634464d943229a.zip | |
Moved boost flags to CMakeLists
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/common/profile.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f58b654..38458bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,10 +67,15 @@ else() "Supported compilers at this time are GCC 4.6+ and clang.") endif() + # Global compile flags # These are specific to GCC/MinGW/clang; for other compilers, change as necessary # The flags are used throughout src/ and test/ subdirs -set(COLOBOT_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast ${CXX11_FLAGS}") + +# Special flags for boost +set(Boost_FLAGS "-DBOOST_NO_SCOPED_ENUMS -DBOOST_NO_CXX11_SCOPED_ENUMS") + +set(COLOBOT_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast ${CXX11_FLAGS} ${Boost_FLAGS}") set(COLOBOT_CXX_FLAGS_RELEASE "-O2") set(COLOBOT_CXX_FLAGS_DEBUG "-g -O0") diff --git a/src/common/profile.h b/src/common/profile.h index ee7ac46..7f99d81 100644 --- a/src/common/profile.h +++ b/src/common/profile.h @@ -23,10 +23,6 @@ #include "common/singleton.h" -// this is just to fix problem with undefined reference when compiling with c++11 support -#define BOOST_NO_SCOPED_ENUMS -#define BOOST_NO_CXX11_SCOPED_ENUMS - #include <boost/property_tree/ptree.hpp> #include <boost/filesystem.hpp> #include <boost/algorithm/string/replace.hpp> |