From e63387260c5275aa2a87a725d11c0473e7baa540 Mon Sep 17 00:00:00 2001 From: Zephyron Date: Tue, 6 May 2025 19:08:36 +1000 Subject: [PATCH] build: Widen MSVC version support for bundled Qt and SDL2 - Updated CMake to allow MSVC versions newer than 2022 (MSVC_VERSION >= 1940) to use the bundled Qt 5.15.2 (msvc2019_64) and SDL2 2.28.2 (x86_64). --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 432234ac8..44aa632a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -500,7 +500,7 @@ if(ENABLE_QT) set(CITRON_QT_NO_CMAKE_SYSTEM_PATH) if(CITRON_USE_BUNDLED_QT) - if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64) + if ((MSVC_VERSION GREATER_EQUAL) AND ARCHITECTURE_x86_64) set(QT_BUILD qt-5.15.2-msvc2019_64) elseif ((${CMAKE_SYSTEM_NAME} STREQUAL "Linux") AND NOT MINGW AND ARCHITECTURE_x86_64) set(QT_BUILD qt5_5_15_2) @@ -529,7 +529,7 @@ endif() if (ENABLE_SDL2) if (CITRON_USE_BUNDLED_SDL2) # Detect toolchain and platform - if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64) + if ((MSVC_VERSION GREATER_EQUAL 1920) AND ARCHITECTURE_x86_64) set(SDL2_VER "SDL2-2.28.2") else() message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable CITRON_USE_BUNDLED_SDL2 and provide your own.")