diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-08-14 18:18:30 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-08-15 17:46:19 +0100 |
| commit | e70290d558d2062487ee472a16e69078b3a81ea6 (patch) | |
| tree | 1fa15d7f03192d5f8c8cfdd1b856d5d9843846b3 | |
| parent | 7632e1182584236ab2e8069ac6e3739fd7de47b0 (diff) | |
Buildsystem: Fix Boost not found targeting VS2015 with pre-built binaries
Fix Boost libraries not being found by CMake when targeting Visual Studio 2015 with Boost installed using the binaries.
Fixes #15277
(cherry picked from commit ca940548bfbeff585983aa537da036f75d3f0f7b)
| -rw-r--r-- | cmake/macros/ConfigureBoost.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/macros/ConfigureBoost.cmake b/cmake/macros/ConfigureBoost.cmake index 190151af155..98caa5eb227 100644 --- a/cmake/macros/ConfigureBoost.cmake +++ b/cmake/macros/ConfigureBoost.cmake @@ -12,7 +12,11 @@ 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() |