diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2021-06-22 03:11:30 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2021-06-22 03:11:30 +0300 |
| commit | d443dcc73364c55385dbd82745459f6af0af5a41 (patch) | |
| tree | 4fbd08a4e6954502301d492c4be41b7c503dd029 /build_files/cmake | |
| parent | 6f158f834dcfa638639391f37afcb2ca8457cb45 (diff) | |
Build/Windows: Preliminary VS 2022 support.
This adds preliminary VS 2022 support, since
there currently is no CMake version that
supports the VS2022 IDE only ninja support
was tested.
IDE support should work without any additional
changes as soon as an updated CMake becomes
available.
As VS2022 appears to keep binary compatibility
with earlier MSVC versions, the current SVN
libraries will work for this version.
Diffstat (limited to 'build_files/cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 99a2cb7966f..8b9a48fca74 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -261,8 +261,10 @@ 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() - # Can be 1910..1912 - if(MSVC_VERSION GREATER 1919) + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.29.30130) + message(STATUS "Visual Studio 2022 detected.") + set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc15) + elseif(MSVC_VERSION GREATER 1919) message(STATUS "Visual Studio 2019 detected.") set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc15) elseif(MSVC_VERSION GREATER 1909) |