diff options
author | Shauren <shauren.trinity@gmail.com> | 2016-01-14 17:45:11 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2016-01-14 17:45:11 +0100 |
commit | e1d2d60ec39497ceea33e034f2ea3c9e1e3a6b21 (patch) | |
tree | e913c8ddd27546794b0e642cc1963524124720bd | |
parent | d2d41c119b99e5a7734f30418c0cd724467b6f89 (diff) |
Buildsystem: Updated required boost version
-rw-r--r-- | cmake/macros/ConfigureBoost.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cmake/macros/ConfigureBoost.cmake b/cmake/macros/ConfigureBoost.cmake index b3a71b8a682..3db9fc54a8c 100644 --- a/cmake/macros/ConfigureBoost.cmake +++ b/cmake/macros/ConfigureBoost.cmake @@ -18,7 +18,7 @@ if(WIN32) add_definitions(-D_WIN32_WINNT=0x0601) endif() -find_package(Boost 1.49 REQUIRED system filesystem thread program_options iostreams regex) +find_package(Boost 1.51 REQUIRED system filesystem thread program_options iostreams regex) add_definitions(-DBOOST_DATE_TIME_NO_LIB) add_definitions(-DBOOST_REGEX_NO_LIB) add_definitions(-DBOOST_CHRONO_NO_LIB) @@ -41,11 +41,7 @@ unset(CMAKE_REQUIRED_LIBRARIES CACHE) unset(CMAKE_REQUIRED_FLAGS CACHE) if (NOT boost_filesystem_copy_links_without_NO_SCOPED_ENUM) - if (Boost_VERSION LESS 105100) # 1.51 - add_definitions(-DBOOST_NO_SCOPED_ENUMS) - else() - add_definitions(-DBOOST_NO_CXX11_SCOPED_ENUMS) - endif() + add_definitions(-DBOOST_NO_CXX11_SCOPED_ENUMS) endif() if(Boost_FOUND) |