diff options
Diffstat (limited to 'src/corelib/Qt6CTestMacros.cmake')
| -rw-r--r-- | src/corelib/Qt6CTestMacros.cmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/corelib/Qt6CTestMacros.cmake b/src/corelib/Qt6CTestMacros.cmake index a27581dd8e..8722553cd0 100644 --- a/src/corelib/Qt6CTestMacros.cmake +++ b/src/corelib/Qt6CTestMacros.cmake @@ -142,17 +142,18 @@ function(_qt_internal_get_cmake_test_configure_options out_var) ) endforeach() - set(prefixes "") - foreach(prefix_path IN LISTS CMAKE_PREFIX_PATH) - file(TO_CMAKE_PATH "${prefix_path}" prefix_path) - list(APPEND prefixes "${prefix_path}") - endforeach() + _qt_internal_get_build_vars_for_external_projects( + PREFIXES_VAR prefixes + ADDITIONAL_PACKAGES_PREFIXES_VAR additional_prefixes + ) + if(arg_OUT_PREFIX_PATH) set(${arg_OUT_PREFIX_PATH} "${prefixes}" PARENT_SCOPE) endif() string(REPLACE ";" "\;" prefixes "${prefixes}") list(APPEND option_list "-DCMAKE_PREFIX_PATH=${prefixes}") + list(APPEND option_list "-DQT_ADDITIONAL_PACKAGES_PREFIX_PATH=${additional_prefixes}") set(${out_var} "${option_list}" PARENT_SCOPE) endfunction() @@ -383,7 +384,7 @@ macro(_qt_internal_test_expect_pass _dir) endif() if(build_environment STREQUAL "ci" AND osx_arch_count GREATER_EQUAL 2 - AND NOT QT_UIKIT_SDK + AND NOT QT_APPLE_SDK AND NOT QT_NO_IOS_BUILD_ADJUSTMENT_IN_CI) list(APPEND additional_configure_args -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_SYSROOT=iphonesimulator) |