summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2021-10-29 20:28:08 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-11-16 10:44:31 +0000
commitf6f648ab05e3ffd5ce70e7257140f0f05d1fda33 (patch)
tree625889b5b5910d15fe68ae350a6a4d8fc746f00a
parent65b48ff4ea262fc88c608cc80d3e1c21c6aa0626 (diff)
Add a support check for windows 10 sdk version
Check for windows 10 sdk was missing, add it back. Fixes: QTBUG-97836 Change-Id: I5551a217aff3e6f730aaec014d96c0d6ce7e396f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 30a7d8d20dd79e88cdba791d78be6297fceaa875) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--configure.cmake12
1 files changed, 12 insertions, 0 deletions
diff --git a/configure.cmake b/configure.cmake
index c7b607e95..015bcd121 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -465,6 +465,18 @@ add_check_for_support(
MESSAGE "${CMAKE_CXX_COMPILER_ID} compiler is not supported."
)
+if(WIN32)
+ 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}")
+ message("-- Windows 10 SDK version: ${windowsSdkVersion}")
+ add_check_for_support(
+ MODULES QtWebEngine QtPdf
+ CONDITION sdkMinor GREATER_EQUAL 19041
+ MESSAGE "Build requires Windows 10 SDK at least version 10.0.19041.0"
+ )
+endif()
+
#### Summary
# > Qt WebEngine Build Features