[Bf-blender-cvs] [a65695759cf] master: Fix MSVS2017 compiler version

Antonioya noreply at git.blender.org
Tue Dec 5 17:16:14 CET 2017


Commit: a65695759cfd6bfb3074271afea9f29e220f5ef8
Author: Antonioya
Date:   Tue Dec 5 17:15:30 2017 +0100
Branches: master
https://developer.blender.org/rBa65695759cfd6bfb3074271afea9f29e220f5ef8

Fix MSVS2017 compiler version

After last update to Visual Studio 2017 15.5.0 the compiler version changed

===================================================================

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 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)



More information about the Bf-blender-cvs mailing list