diff options
| author | jackpoz <giacomopoz@gmail.com> | 2019-04-19 22:37:50 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2019-04-19 22:37:50 +0200 |
| commit | 3d3b7f438c6638aed998f4233b809826a3cf0f54 (patch) | |
| tree | bb5c0a3e670200b55ead13088160c405198e7e04 | |
| parent | 5262d760ffc73cee61bb6cdd151df1364e9b41f3 (diff) | |
Buildsystem: Fix finding VS 2019 compiled boost libs
| -rw-r--r-- | cmake/macros/FindBoost.cmake | 4 | ||||
| -rw-r--r-- | dep/boost/CMakeLists.txt | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/cmake/macros/FindBoost.cmake b/cmake/macros/FindBoost.cmake index 23e76093e82..37cce11f51c 100644 --- a/cmake/macros/FindBoost.cmake +++ b/cmake/macros/FindBoost.cmake @@ -384,7 +384,9 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret) set (_boost_COMPILER "-il") endif() elseif("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC") - if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10) + if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.20) + set(_boost_COMPILER "-vc142;-vc141") + elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10) set(_boost_COMPILER "-vc141;-vc140") elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19) set(_boost_COMPILER "-vc140") diff --git a/dep/boost/CMakeLists.txt b/dep/boost/CMakeLists.txt index 4a2332c2c19..a39e017dc6c 100644 --- a/dep/boost/CMakeLists.txt +++ b/dep/boost/CMakeLists.txt @@ -18,9 +18,15 @@ if(WIN32) if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10) set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.0) else() - list(APPEND BOOST_LIBRARYDIR - ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.1 - ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.0 ) + if (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 ) + else() + list(APPEND BOOST_LIBRARYDIR + ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.2 + ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.1 ) + endif() endif() endif() else() |