mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-18 05:01:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tests/RunCMake/CMakePackage: Add architecture i386 for macOS on Xcode < 10

Browse Source 
Use every architecture each version of Xcode has in `$(ARCHS_STANDARD)`.
This commit is contained in:
Brad King
2024-03-19 09:35:09 -04:00
parent 788c204788
commit 677f3d721b
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Tests/RunCMake/CMakePackage/RunCMakeTest.cmake
View File

@@ -50,10 +50,17 @@ if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 12) if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 12)
set(macos_archs "x86_64;arm64") set(macos_archs "x86_64;arm64")
set(tvos_sim_archs "x86_64;arm64")
set(watch_sim_archs "x86_64") set(watch_sim_archs "x86_64")
set(select_archs "arm64;x86_64") set(select_archs "arm64;x86_64")
else() elseif(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 10)
set(macos_archs "x86_64") 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(watch_sim_archs "i386")
set(select_archs "") set(select_archs "")
endif() endif()
@@ -81,8 +88,7 @@ if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
apple_export(ios-simulator-${arch} iOS "${arch}" iphonesimulator) apple_export(ios-simulator-${arch} iOS "${arch}" iphonesimulator)
endforeach() endforeach()
endif() endif()
apple_export(tvos-simulator tvOS "${tvos_sim_archs}" appletvsimulator)
apple_export(tvos-simulator tvOS "${macos_archs}" appletvsimulator)
if(enable_visionos) if(enable_visionos)
apple_export(visionos-simulator visionOS "${macos_archs}" xrsimulator) apple_export(visionos-simulator visionOS "${macos_archs}" xrsimulator)
endif() endif()
@@ -101,7 +107,7 @@ if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
apple_import(ios-simulator-${arch} iOS "${arch}" iphonesimulator) apple_import(ios-simulator-${arch} iOS "${arch}" iphonesimulator)
endforeach() endforeach()
endif() endif()
apple_import(tvos-simulator tvOS "${macos_archs}" appletvsimulator) apple_import(tvos-simulator tvOS "${tvos_sim_archs}" appletvsimulator)
if(enable_visionos) if(enable_visionos)
apple_import(visionos-simulator visionOS "${macos_archs}" xrsimulator) apple_import(visionos-simulator visionOS "${macos_archs}" xrsimulator)
endif() endif()