[Bf-blender-cvs] [a5805650869] master: CMake: avoid checking each MSVC minor revision
Campbell Barton
noreply at git.blender.org
Tue Dec 5 17:25:03 CET 2017
Commit: a58056508691adf6ec25a27c9264fca607bef1ce
Author: Campbell Barton
Date: Wed Dec 6 03:38:44 2017 +1100
Branches: master
https://developer.blender.org/rBa58056508691adf6ec25a27c9264fca607bef1ce
CMake: avoid checking each MSVC minor revision
===================================================================
M build_files/cmake/platform/platform_win32.cmake
===================================================================
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)
More information about the Bf-blender-cvs
mailing list