From 69f6761eb51029c5050d1fe0cf97a44a77fc7691 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 27 Oct 2022 16:35:51 +0200 Subject: Require minimum msvc version 14.29 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of fixing the code to compile with lower version, simply require at least version present on ci. Fixes: QTBUG-108029 Pick-to: 6.4 Change-Id: Ie6fbd7c3451a39c09dfb15e0cf9850672c9d4ea8 Reviewed-by: Michael BrĂ¼ning --- configure.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure.cmake b/configure.cmake index 9c177115d..37ac1f428 100644 --- a/configure.cmake +++ b/configure.cmake @@ -558,6 +558,13 @@ add_check_for_support( ) if(WIN32) + if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC) + add_check_for_support( + MODULES QtWebEngine QtPdf + CONDITION NOT MSVC_VERSION LESS 1929 + MESSAGE "MSVC compiler version must be at least 14.29." + ) + endif() set(windowsSdkVersion $ENV{WindowsSDKVersion}) string(REGEX REPLACE "([0-9.]+).*" "\\1" windowsSdkVersion "${windowsSdkVersion}") string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" sdkMinor "${windowsSdkVersion}") -- cgit v1.2.3