diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2017-12-05 21:04:34 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2017-12-05 21:04:34 +0300 |
| commit | 272973804e39358b4fdbb1e954ebcd52a2f6b152 (patch) | |
| tree | b80eb4f13fc2ac68b6a279b72a0302acdcd14ca2 /build_files | |
| parent | 702c0a01b24869d6cb133ee00e1f85fc302c45a5 (diff) | |
| parent | 855799ecc1c5e53d9fbfe520fd5402bc0138f674 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 5cc5fb8c7d6..d1a19784365 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -142,10 +142,8 @@ if(NOT DEFINED LIBDIR) message(STATUS "32 bit compiler detected.") set(LIBDIR_BASE "windows") endif() - if(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) |