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:
authorAntonioya <blendergit@gmail.com>2017-12-05 19:15:30 +0300
committerAntonio Vazquez <blendergit@gmail.com>2017-12-05 19:16:02 +0300
commita65695759cfd6bfb3074271afea9f29e220f5ef8 (patch)
tree217952b931e6fb60a9e5ad61e4896fff40cf59b1 /build_files
parent3959ce0540a8a0bcfd19321b64f1d59561f106be (diff)
Fix MSVS2017 compiler version
After last update to Visual Studio 2017 15.5.0 the compiler version changed
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/platform/platform_win32.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 094ab94d881..6df268f94c7 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -142,7 +142,10 @@ if(NOT DEFINED LIBDIR)
message(STATUS "32 bit compiler detected.")
set(LIBDIR_BASE "windows")
endif()
- if(MSVC_VERSION EQUAL 1911)
+ 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)