diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-19 13:35:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-03-19 13:46:57 (GMT) |
| commit | 677f3d721b6a469c0312abc0f880ffd017f8911a (patch) | |
| tree | 457806fe867898d08c940d936b50462cd607bc54 | |
| parent | 788c2047883d64f16122c155f1c86a43dcd35970 (diff) | |
| download | CMake-677f3d721b6a469c0312abc0f880ffd017f8911a.zip CMake-677f3d721b6a469c0312abc0f880ffd017f8911a.tar.gz CMake-677f3d721b6a469c0312abc0f880ffd017f8911a.tar.bz2 | |
Tests/RunCMake/CMakePackage: Add architecture i386 for macOS on Xcode < 10
Use every architecture each version of Xcode has in `$(ARCHS_STANDARD)`.
| -rw-r--r-- | Tests/RunCMake/CMakePackage/RunCMakeTest.cmake | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Tests/RunCMake/CMakePackage/RunCMakeTest.cmake b/Tests/RunCMake/CMakePackage/RunCMakeTest.cmake index 32fc7fb..7d9d42a 100644 --- a/Tests/RunCMake/CMakePackage/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMakePackage/RunCMakeTest.cmake @@ -50,10 +50,17 @@ if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "AppleClang") if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 12) set(macos_archs "x86_64;arm64") + set(tvos_sim_archs "x86_64;arm64") set(watch_sim_archs "x86_64") set(select_archs "arm64;x86_64") - else() + elseif(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 10) set(macos_archs "x86_64") + set(tvos_sim_archs "x86_64") + set(watch_sim_archs "i386") + set(select_archs "") + else() + set(macos_archs "i386;x86_64") + set(tvos_sim_archs "x86_64") set(watch_sim_archs "i386") set(select_archs "") endif() @@ -81,8 +88,7 @@ if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "AppleClang") apple_export(ios-simulator-${arch} iOS "${arch}" iphonesimulator) endforeach() endif() - - apple_export(tvos-simulator tvOS "${macos_archs}" appletvsimulator) + apple_export(tvos-simulator tvOS "${tvos_sim_archs}" appletvsimulator) if(enable_visionos) apple_export(visionos-simulator visionOS "${macos_archs}" xrsimulator) endif() @@ -101,7 +107,7 @@ if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "AppleClang") apple_import(ios-simulator-${arch} iOS "${arch}" iphonesimulator) endforeach() endif() - apple_import(tvos-simulator tvOS "${macos_archs}" appletvsimulator) + apple_import(tvos-simulator tvOS "${tvos_sim_archs}" appletvsimulator) if(enable_visionos) apple_import(visionos-simulator visionOS "${macos_archs}" xrsimulator) endif() |