diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2023-06-28 15:59:23 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-07-30 20:05:18 +0000 |
| commit | 565e6be400459117087febbab3162248bd8a0cbd (patch) | |
| tree | 90118dde632ffae1fc653d2fb2591fc3dd3f6c90 | |
| parent | 7570aa3b27ee81f98b54918c7ff2093b27a12570 (diff) | |
Make visual studio configure check last
Check first for the compiler version as visual studio
test assumes the compiler is valid and the error message
can be misleading in a case the test fails.
Fixes: QTBUG-114875
Change-Id: Ie25185943845cbbfd0dc45334161fba245fb86ea
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit 886c3fe8d5e7d9e4938943c04efb943660d4a96e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | configure.cmake | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/configure.cmake b/configure.cmake index 51ef08f03..688c68d4e 100644 --- a/configure.cmake +++ b/configure.cmake @@ -584,11 +584,6 @@ add_check_for_support( ${xcbErrorMessage}" ) add_check_for_support( - MODULES QtWebEngine QtPdf - CONDITION NOT MSVC OR TEST_winversion - MESSAGE "Build requires Visual Studio 2022 or higher." -) -add_check_for_support( MODULES QtWebEngine CONDITION MSVC OR (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL GNU) OR @@ -610,7 +605,6 @@ add_check_for_support( MESSAGE "${CMAKE_CXX_COMPILER_ID} compiler is not supported." ) - if(WIN32) if(MSVC) add_check_for_support( @@ -629,6 +623,11 @@ if(WIN32) MESSAGE "Build requires Windows 11 SDK at least version 10.0.22621.0" ) endif() +add_check_for_support( + MODULES QtWebEngine QtPdf + CONDITION NOT MSVC OR TEST_winversion + MESSAGE "Build requires Visual Studio 2022 or higher." +) #### Summary |