diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-12-13 18:17:26 +0100 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-12-14 01:36:12 +0100 |
| commit | 0c3892bb261f0eebebdff4cf42169f49729956a9 (patch) | |
| tree | 69e342cb3118857644290aec61166c5c8e19f733 | |
| parent | 6b09b515367b2c293e3d8284f37a6120d2f83019 (diff) | |
Fix an issue where it was not possible to build iOS tests in tree
Before this, when trying to build iOS tests, CMake could not find the
`LaunchScreen.storyboard` in the source directory, and therefore the
configuration was failing.
In addition, QtPublicFinalizerHelpers module was missing in QtBuild,
resulting in another configuration failure when configuring iOS tests.
Pick-to: 6.7
Change-Id: I592121892a2716973a92ec044414fa729fd3b15f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | cmake/QtBuildPathsHelpers.cmake | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake index edc43f2f140..18082ac6a5f 100644 --- a/cmake/QtBuildPathsHelpers.cmake +++ b/cmake/QtBuildPathsHelpers.cmake @@ -205,6 +205,18 @@ macro(qt_internal_set_qt_cmake_dir) set(QT_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}") endmacro() +macro(qt_internal_set_qt_apple_support_files_path) + # This is analogous to what we have in QtConfig.cmake.in. It's copied here so that iOS + # tests can be built in tree. + if(APPLE) + if(NOT CMAKE_SYSTEM_NAME OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(__qt_internal_cmake_apple_support_files_path "${QT_CMAKE_DIR}/macos") + elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS") + set(__qt_internal_cmake_apple_support_files_path "${QT_CMAKE_DIR}/ios") + endif() + endif() +endmacro() + macro(qt_internal_set_qt_staging_prefix) if(NOT "${CMAKE_STAGING_PREFIX}" STREQUAL "") set(QT_STAGING_PREFIX "${CMAKE_STAGING_PREFIX}") @@ -227,4 +239,6 @@ macro(qt_internal_setup_paths_and_prefixes) qt_internal_set_cmake_install_libdir() qt_internal_set_qt_cmake_dir() + + qt_internal_set_qt_apple_support_files_path() endmacro() |