[Bf-blender-cvs] [ee3b4e84209] master: Windows: Fix VS2022 detection

Ray Molenkamp noreply at git.blender.org
Fri Sep 10 01:20:04 CEST 2021


Commit: ee3b4e8420928a03e9158489a87d5daa34ee302f
Author: Ray Molenkamp
Date:   Thu Sep 9 17:19:58 2021 -0600
Branches: master
https://developer.blender.org/rBee3b4e8420928a03e9158489a87d5daa34ee302f

Windows: Fix VS2022 detection

VS2019 had a compiler update moving it into the
range that was used to detect VS2022. This patch
updates the detection to the current VS2022
preview compiler version.

Reported by Jesse Y on chat.

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

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 e3183fe5b7f..cb4d196d43f 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -259,7 +259,7 @@ if(NOT DEFINED LIBDIR)
   else()
     message(FATAL_ERROR "32 bit compiler detected, blender no longer provides pre-build libraries for 32 bit windows, please set the LIBDIR cmake variable to your own library folder")
   endif()
-  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.29.30130)
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.30.30423)
     message(STATUS "Visual Studio 2022 detected.")
     set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc15)
   elseif(MSVC_VERSION GREATER 1919)



More information about the Bf-blender-cvs mailing list