aboutsummaryrefslogtreecommitdiff
path: root/dep/boost
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2017-04-22 18:07:59 -0300
committerAokromes <aokromes@gmail.com>2017-06-26 00:31:48 +0200
commit5734643cecbadfffb7ee1b66c9665d57108923f6 (patch)
treeaa3d66a6a804d4be4318dfe7eaada2e7d8472d28 /dep/boost
parentb55fb35b937a51821c7529cbaf11a9af2cf35183 (diff)
Build: fix finding VS 2017 compiled boost libs
Diffstat (limited to 'dep/boost')
-rw-r--r--dep/boost/CMakeLists.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/dep/boost/CMakeLists.txt b/dep/boost/CMakeLists.txt
index 8d1e71dbf7a..3afe13b1ef0 100644
--- a/dep/boost/CMakeLists.txt
+++ b/dep/boost/CMakeLists.txt
@@ -15,7 +15,13 @@ if(WIN32)
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)
+ 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 )
+ endif()
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.")