aboutsummaryrefslogtreecommitdiff
path: root/dep
diff options
context:
space:
mode:
authorvincent-michael <vincent_michael@gmx.de>2017-06-27 22:02:49 +0200
committervincent-michael <vincent_michael@gmx.de>2017-06-27 22:02:49 +0200
commit2645aedf616a7c256541d7348153211afc8652cf (patch)
treeb9bc02763dc2fb23d72f89aaeaaa7ecbc429d143 /dep
parentcdda3e4c71b83d5a5f4be8991d0da074c9d61112 (diff)
CMake: Optimize code in 5734643cecbadfffb7ee1b66c9665d57108923f6
Diffstat (limited to 'dep')
-rw-r--r--dep/boost/CMakeLists.txt12
1 files changed, 5 insertions, 7 deletions
diff --git a/dep/boost/CMakeLists.txt b/dep/boost/CMakeLists.txt
index 3afe13b1ef0..4c91fec3f85 100644
--- a/dep/boost/CMakeLists.txt
+++ b/dep/boost/CMakeLists.txt
@@ -14,14 +14,12 @@ if(WIN32)
set(BOOST_ROOT $ENV{BOOST_ROOT})
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0)
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()
- 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()
+ list(APPEND BOOST_LIBRARYDIR
+ ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.1
+ ${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.")