diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2025-12-15 09:18:56 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2025-12-16 03:50:16 +0000 |
| commit | c249283a2468acc9ba13448d754a9d1972227dc6 (patch) | |
| tree | 99a3a689ea889ad1bceab188fa3e0d06de3eb690 | |
| parent | b783c474a5da40635c17ec9f8c4e1ef174921415 (diff) | |
CMake: QT_NO_XCODE_MIN_VERSION_CHECK skips Xcode installation check6.11
Setting QT_NO_XCODE_MIN_VERSION_CHECK to ON will now skip the Xcode
installation check. This is necessary for people who have only the
toolchain installed without Xcode.
Fixes: QTBUG-138427
Pick-to: 6.10
Change-Id: I9c811640bad90fdac0d63b4b6f21371053ce5bf8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit c17ae1096e0548041150b692b3458de19df2f534)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | cmake/QtPublicAppleHelpers.cmake | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cmake/QtPublicAppleHelpers.cmake b/cmake/QtPublicAppleHelpers.cmake index 3ffe53c6f34..b8f3fb4818e 100644 --- a/cmake/QtPublicAppleHelpers.cmake +++ b/cmake/QtPublicAppleHelpers.cmake @@ -1028,7 +1028,6 @@ function(_qt_internal_check_apple_sdk_and_xcode_versions) endif() _qt_internal_get_cached_apple_sdk_version(sdk_version) - _qt_internal_get_cached_xcode_version(xcode_version) if(NOT max_sdk_version MATCHES "^[0-9]+$") message(FATAL_ERROR @@ -1075,12 +1074,15 @@ function(_qt_internal_check_apple_sdk_and_xcode_versions) ) endif() - if(xcode_version VERSION_LESS min_xcode_version AND NOT QT_NO_XCODE_MIN_VERSION_CHECK) - message(${message_type} - "Qt requires at least version ${min_xcode_version} of Xcode, " - "you're building against version ${xcode_version}. Please upgrade." - ${extra_message} - ) + if(NOT QT_NO_XCODE_MIN_VERSION_CHECK) + _qt_internal_get_cached_xcode_version(xcode_version) + if(xcode_version VERSION_LESS min_xcode_version) + message(${message_type} + "Qt requires at least version ${min_xcode_version} of Xcode, " + "you're building against version ${xcode_version}. Please upgrade." + ${extra_message} + ) + endif() endif() if(QT_NO_APPLE_SDK_MAX_VERSION_CHECK) |