diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-20 13:51:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-03-20 13:51:43 (GMT) |
| commit | 3135a99467f2645e3f6824efe44dee6e57b29bd8 (patch) | |
| tree | 475a0e802cbc6d9bc4cd3a9280a37648a72e5daa /Modules/Internal | |
| parent | b877fb49ce1a44ed0b6769ea82da7899fa2905eb (diff) | |
| parent | 85d6d3b2e3537b7730542dc410dd6540ee61fcae (diff) | |
| download | CMake-3135a99467f2645e3f6824efe44dee6e57b29bd8.zip CMake-3135a99467f2645e3f6824efe44dee6e57b29bd8.tar.gz CMake-3135a99467f2645e3f6824efe44dee6e57b29bd8.tar.bz2 | |
Merge topic 'package-dispatch-apple' into release-3.29
85d6d3b2e3 generate_apple_*_selection_file: Add option to capture errors
2149dbd379 generate_apple_architecture_selection_file: Document $(ARCHS_STANDARD) support
be642f6ed5 generate_apple_architecture_selection_file: Simplify signature
8959ad9db1 Tests/RunCMake/CMakePackage: Fix Apple architecture selection argument order
677f3d721b Tests/RunCMake/CMakePackage: Add architecture i386 for macOS on Xcode < 10
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9349
Diffstat (limited to 'Modules/Internal')
| -rw-r--r-- | Modules/Internal/AppleArchitectureSelection.cmake.in | 6 | ||||
| -rw-r--r-- | Modules/Internal/ApplePlatformSelection.cmake.in | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Modules/Internal/AppleArchitectureSelection.cmake.in b/Modules/Internal/AppleArchitectureSelection.cmake.in index fec0d41..b7315b6 100644 --- a/Modules/Internal/AppleArchitectureSelection.cmake.in +++ b/Modules/Internal/AppleArchitectureSelection.cmake.in @@ -1,8 +1,2 @@ @PACKAGE_INIT@ - -if(NOT CMAKE_OSX_ARCHITECTURES) - message(FATAL_ERROR "CMAKE_OSX_ARCHITECTURES must be explicitly set for this package") -endif() @_branch_code@ - -message(FATAL_ERROR "Architecture not supported") diff --git a/Modules/Internal/ApplePlatformSelection.cmake.in b/Modules/Internal/ApplePlatformSelection.cmake.in index 5f5e01d..6c03ab6 100644 --- a/Modules/Internal/ApplePlatformSelection.cmake.in +++ b/Modules/Internal/ApplePlatformSelection.cmake.in @@ -1,6 +1,7 @@ @PACKAGE_INIT@ string(TOLOWER "${CMAKE_OSX_SYSROOT}" _CMAKE_OSX_SYSROOT_LOWER) +@_branch_INIT@ if(_CMAKE_OSX_SYSROOT_LOWER MATCHES "(^|/)iphonesimulator") @_branch_IOS_SIMULATOR_INCLUDE_FILE@ elseif(_CMAKE_OSX_SYSROOT_LOWER MATCHES "(^|/)iphoneos") @@ -20,5 +21,5 @@ elseif(_CMAKE_OSX_SYSROOT_LOWER MATCHES "(^|/)xros") elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") @_branch_MACOS_INCLUDE_FILE@ else() - message(FATAL_ERROR "Platform not supported") + @_branch_ELSE@ endif() |