diff options
| author | Brad King <brad.king@kitware.com> | 2023-12-18 15:56:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-12-18 15:56:43 (GMT) |
| commit | edb10c53256a4c308548af298eafc9ddf90b3bda (patch) | |
| tree | 38e1287241f8329880119ee5872b8b39a35e4a73 /Modules | |
| parent | 43e6d30061f96d4bf7e1f0304d038f56b93b8ee3 (diff) | |
| parent | 1dd4a9baff389f2f62142c38f76d6383290c6ed6 (diff) | |
| download | CMake-edb10c53256a4c308548af298eafc9ddf90b3bda.zip CMake-edb10c53256a4c308548af298eafc9ddf90b3bda.tar.gz CMake-edb10c53256a4c308548af298eafc9ddf90b3bda.tar.bz2 | |
Merge topic 'package-dispatch-apple'
1dd4a9baff Tests: Cover generate_apple_platform_selection_file on all platforms
3148db4533 CMakePackageConfigHelpers: Fix Apple platform selection for tvOS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9077
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Internal/PlatformSelectionFile.cmake.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Internal/PlatformSelectionFile.cmake.in b/Modules/Internal/PlatformSelectionFile.cmake.in index 3f80f4b..493d650 100644 --- a/Modules/Internal/PlatformSelectionFile.cmake.in +++ b/Modules/Internal/PlatformSelectionFile.cmake.in @@ -5,9 +5,9 @@ if(_CMAKE_OSX_SYSROOT_LOWER MATCHES "(^|/)iphonesimulator") @_branch_IOS_SIMULATOR_CONFIG_FILE@ elseif(_CMAKE_OSX_SYSROOT_LOWER MATCHES "(^|/)iphoneos") @_branch_IOS_CONFIG_FILE@ -elseif(_CMAKE_OSX_SYSROOT_LOWER MATCHES "(^|/)tvsimulator") +elseif(_CMAKE_OSX_SYSROOT_LOWER MATCHES "(^|/)appletvsimulator") @_branch_TVOS_SIMULATOR_CONFIG_FILE@ -elseif(_CMAKE_OSX_SYSROOT_LOWER MATCHES "(^|/)tvos") +elseif(_CMAKE_OSX_SYSROOT_LOWER MATCHES "(^|/)appletvos") @_branch_TVOS_CONFIG_FILE@ elseif(_CMAKE_OSX_SYSROOT_LOWER MATCHES "(^|/)watchsimulator") @_branch_WATCHOS_SIMULATOR_CONFIG_FILE@ |