diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-10-27 16:35:51 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2022-11-01 01:21:44 +0200 |
| commit | 69f6761eb51029c5050d1fe0cf97a44a77fc7691 (patch) | |
| tree | 1a1bbe707c91d0670602c09144b63635b5e242a8 | |
| parent | 9222e0860e0ca6de1a775d73d6af0ebb01474b7c (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
Pick-to: 6.4
Change-Id: Ie6fbd7c3451a39c09dfb15e0cf9850672c9d4ea8
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| -rw-r--r-- | configure.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
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}") |