summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2022-08-12 16:33:16 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-08-15 16:19:15 +0000
commit807fd5684a42cefa63319bfe4dde2bbbca8eefa8 (patch)
treeed3932b193809a37c654ff575c864f2b2681d827 /cmake
parentd65c618915bfc7b08089c376d879e94cd567978f (diff)
downloadqtbase-807fd5684a42cefa63319bfe4dde2bbbca8eefa8.tar.gz
CMake: Use the Xcode generator for qt-cmake-standalone-test on iOS
Task-number: QTBUG-104754 Change-Id: I43aae05f7e101a619d2c1b97d9a96c74d8498bfa Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 3608bb543d4a862a185ffba55043f736c42c9ace) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtWrapperScriptHelpers.cmake14
1 files changed, 12 insertions, 2 deletions
diff --git a/cmake/QtWrapperScriptHelpers.cmake b/cmake/QtWrapperScriptHelpers.cmake
index adb50bf25b..d7efb726ac 100644
--- a/cmake/QtWrapperScriptHelpers.cmake
+++ b/cmake/QtWrapperScriptHelpers.cmake
@@ -95,8 +95,18 @@ function(qt_internal_create_wrapper_scripts)
set(__qt_cmake_standalone_test_bin_name "qt-cmake-standalone-test")
set(__qt_cmake_standalone_test_bin_path
"${INSTALL_BINDIR}/${__qt_cmake_standalone_test_bin_name}")
- set(__qt_cmake_private_path
- "${QT_STAGING_PREFIX}/${INSTALL_BINDIR}/qt-cmake-private")
+
+ # Configuring a standalone test on iOS should use the Xcode generator, but qt-cmake-private uses
+ # the generator that was used to build Qt itself (e.g. Ninja).
+ # Use qt-cmake instead, which does use the Xcode generator since Qt 6.2.5, 6.3.1, 6.4.
+ if(IOS)
+ set(__qt_cmake_private_path
+ "${QT_STAGING_PREFIX}/${INSTALL_BINDIR}/qt-cmake")
+ else()
+ set(__qt_cmake_private_path
+ "${QT_STAGING_PREFIX}/${INSTALL_BINDIR}/qt-cmake-private")
+ endif()
+
set(__qt_cmake_standalone_test_path
"${__build_internals_install_dir}/${__build_internals_standalone_test_template_dir}")