diff options
| author | jackpoz <giacomopoz@gmail.com> | 2019-04-19 22:37:50 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-01 00:28:13 +0100 |
| commit | aeaca00d76d0fdaee6d21050a1fadcf1f0543358 (patch) | |
| tree | 7f7ebed1f484c618493368da4b967d0f38934951 /dep/boost | |
| parent | bade67e74b49be98ab8847201864ef7c4e548026 (diff) | |
Buildsystem: Fix finding VS 2019 compiled boost libs
(cherry picked from commit 3d3b7f438c6638aed998f4233b809826a3cf0f54)
Diffstat (limited to 'dep/boost')
| -rw-r--r-- | dep/boost/CMakeLists.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/dep/boost/CMakeLists.txt b/dep/boost/CMakeLists.txt index 1637bfa46bb..6e1b1953d45 100644 --- a/dep/boost/CMakeLists.txt +++ b/dep/boost/CMakeLists.txt @@ -16,10 +16,14 @@ if(WIN32) set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-12.0) elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10) set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.0) - else() + elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.20) list(APPEND BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.1 - ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.0) + ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.0 ) + else() + list(APPEND BOOST_LIBRARYDIR + ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.2 + ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.1 ) endif() elseif(NOT DEFINED Boost_DIR AND NOT DEFINED BOOST_ROOT AND NOT DEFINED BOOSTROOT) message(FATAL_ERROR "No BOOST_ROOT environment variable could be found! Please make sure it is set and the points to your Boost installation.") @@ -75,7 +79,7 @@ target_compile_definitions(boost -DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB -DBOOST_CHRONO_NO_LIB - # Due to MSVC linking error boost::none" already defined in scripts_... + # Due to MSVC linking error boost::none" already defined in scripts_... # May be removed when the requirement is raised to boost 1.61 on windows. -DBOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE -DBOOST_SERIALIZATION_NO_LIB |