Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-12-05 19:38:44 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-12-05 19:38:44 +0300
commita58056508691adf6ec25a27c9264fca607bef1ce (patch)
tree40ba36107e382211b59fc29f3553fda1221c39ac /build_files
parenta65695759cfd6bfb3074271afea9f29e220f5ef8 (diff)
CMake: avoid checking each MSVC minor revision
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/platform/platform_win32.cmake9
1 files changed, 2 insertions, 7 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 6df268f94c7..2a62ba7bf20 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -142,13 +142,8 @@ if(NOT DEFINED LIBDIR)
message(STATUS "32 bit compiler detected.")
set(LIBDIR_BASE "windows")
endif()
- if(MSVC_VERSION EQUAL 1912)
- message(STATUS "Visual Studio 2017 detected.")
- set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14)
- elseif(MSVC_VERSION EQUAL 1911)
- message(STATUS "Visual Studio 2017 detected.")
- set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14)
- elseif(MSVC_VERSION EQUAL 1910)
+ # Can be 1910..1912
+ if(MSVC_VERSION GREATER_EQUAL 1910)
message(STATUS "Visual Studio 2017 detected.")
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14)
elseif(MSVC_VERSION EQUAL 1900)