summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2022-10-27 16:35:51 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-11-01 16:51:46 +0000
commit0e2b422fddef17cf9bfc8e31ed4a8f62566e27a0 (patch)
tree81f19e7375d91c72c5712d506c3e208093704337
parent6db610ecb0f686a5e7321e217ba012557c6b2fe6 (diff)
Require minimum msvc version 14.29
Instead of fixing the code to compile with lower version, simply require at least version present on ci. Fixes: QTBUG-108029 Change-Id: Ie6fbd7c3451a39c09dfb15e0cf9850672c9d4ea8 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io> (cherry picked from commit 69f6761eb51029c5050d1fe0cf97a44a77fc7691) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--configure.cmake7
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.cmake b/configure.cmake
index 907ae615d..f485c1b4b 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -555,6 +555,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}")