diff options
Diffstat (limited to 'cmake/macros/ConfigureBoost.cmake')
| -rw-r--r-- | cmake/macros/ConfigureBoost.cmake | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/cmake/macros/ConfigureBoost.cmake b/cmake/macros/ConfigureBoost.cmake index 190151af155..3db9fc54a8c 100644 --- a/cmake/macros/ConfigureBoost.cmake +++ b/cmake/macros/ConfigureBoost.cmake @@ -1,18 +1,12 @@ -macro(get_WIN32_WINNT version) - if (WIN32 AND CMAKE_SYSTEM_VERSION) - set(ver ${CMAKE_SYSTEM_VERSION}) - string(REPLACE "." "" ver ${ver}) - string(REGEX REPLACE "([0-9])" "0\\1" ver ${ver}) - - set(${version} "0x${ver}") - endif() -endmacro() - if(WIN32) set(BOOST_DEBUG ON) if(DEFINED ENV{BOOST_ROOT}) set(BOOST_ROOT $ENV{BOOST_ROOT}) - set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-12.0) + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0) + set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-12.0) + else() + set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.0) + endif() else() message(FATAL_ERROR "No BOOST_ROOT environment variable could be found! Please make sure it is set and the points to your Boost installation.") endif() @@ -21,11 +15,10 @@ if(WIN32) set(Boost_USE_MULTITHREADED ON) set(Boost_USE_STATIC_RUNTIME OFF) - get_WIN32_WINNT(ver) - add_definitions(-D_WIN32_WINNT=${ver}) + add_definitions(-D_WIN32_WINNT=0x0601) endif() -find_package(Boost 1.49 REQUIRED system filesystem thread program_options iostreams) +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) @@ -48,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) |