commit d8ef7317386ed737dbcec41646799c0847aeb2ee
author Brad King <brad.king@kitware.com> Wed Aug 16 13:42:52 2023 +0000
committer Kitware Robot <kwrobot@kitware.com> Wed Aug 16 09:42:52 2023 -0400
tree 105f16a09a8902acef76042f01c3c4489933da7a
parent 955d2b8847a0709b3c79b06de4fcb2028811fd8a
parent dfab044c44caa1911cc2573341e369b6b0ec47fe

Merge topic 'FindPython-3.13' into release-3.27

dfab044c44 FindPython: add support for Python 3.13

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8712

Modules/CMakeFindBinUtils.cmake

diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index 327ef0b..f778891 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -229,7 +229,7 @@
     set(CMAKE_RANLIB : CACHE INTERNAL "noop for ranlib")
 endif()
 
-if(NOT CMAKE_TAPI)
+if(APPLE AND "TAPI" IN_LIST _CMAKE_TOOL_VARS AND NOT CMAKE_TAPI)
   # try to pick-up from Apple toolchain
   execute_process(COMMAND xcrun --find tapi
     OUTPUT_VARIABLE _xcrun_out

Modules/FindJNI.cmake

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index c6d7b09..e7050a3 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -388,11 +388,15 @@
   else()
     # get xcode version
     execute_process(
-          COMMAND xcodebuild -version
-          OUTPUT_VARIABLE _xcode_version
-          )
-    string(REGEX REPLACE "Xcode ([0-9]+(\\.[0-9]+)*)" "\\1" _FindJNI_XCODE_VERSION ${_xcode_version})
-    unset(_xcode_version)
+      COMMAND xcodebuild -version
+      OUTPUT_VARIABLE _FindJNI_XCODEBUILD_VERSION
+      )
+    if(_FindJNI_XCODEBUILD_VERSION MATCHES "Xcode ([0-9]+(\\.[0-9]+)*)")
+      set(_FindJNI_XCODE_VERSION "${CMAKE_MATCH_1}")
+    else()
+      set(_FindJNI_XCODE_VERSION "")
+    endif()
+    unset(_FindJNI_XCODEBUILD_VERSION)
   endif()
 
   if(_FindJNI_XCODE_VERSION VERSION_GREATER 12.1)

Tests/RunCMake/AppleTextStubs/Framework-import.cmake

diff --git a/Tests/RunCMake/AppleTextStubs/Framework-import.cmake b/Tests/RunCMake/AppleTextStubs/Framework-import.cmake
index e0001d0..d142c0c 100644
--- a/Tests/RunCMake/AppleTextStubs/Framework-import.cmake
+++ b/Tests/RunCMake/AppleTextStubs/Framework-import.cmake
@@ -10,15 +10,15 @@
   message(SEND_ERROR "foo-build::foo: FRAMEWORK not set.")
 endif()
 get_property(enable_exports TARGET foo-install::foo PROPERTY ENABLE_EXPORTS)
-if (CAMKE_TAPI AND NOT enable_exports)
+if (CMAKE_TAPI AND NOT enable_exports)
   message(SEND_ERROR "foo-install::foo: ENABLE_EXPORTS not set.")
 endif()
 
 get_property(implib TARGET foo-install::foo PROPERTY IMPORTED_IMPLIB_RELEASE)
-if (CAMKE_TAPI AND NOT implib)
+if (CMAKE_TAPI AND NOT implib)
   message(SEND_ERROR "foo-install::foo: IMPORTED_IMPLIB_RELEASE not set.")
 endif()
-if (CAMKE_TAPI AND NOT implib MATCHES "foo.framework/Versions/A/foo.tbd$")
+if (CMAKE_TAPI AND NOT implib MATCHES "foo.framework/Versions/A/foo.tbd$")
   message(SEND_ERROR "foo-install::foo: ${implib}: wrong value for IMPORTED_IMPLIB_RELEASE.")
 endif()
 
@@ -41,15 +41,15 @@
   message(SEND_ERROR "foo-build::foo: FRAMEWORK not set.")
 endif()
 get_property(enable_exports TARGET foo-build::foo PROPERTY ENABLE_EXPORTS)
-if (CAMKE_TAPI AND NOT enable_exports)
+if (CMAKE_TAPI AND NOT enable_exports)
   message(SEND_ERROR "foo-build::foo: ENABLE_EXPORTS not set.")
 endif()
 
 get_property(implib TARGET foo-build::foo PROPERTY IMPORTED_IMPLIB_RELEASE)
-if (CAMKE_TAPI AND NOT implib)
+if (CMAKE_TAPI AND NOT implib)
   message(SEND_ERROR "foo-build::foo: IMPORTED_IMPLIB_RELEASE not set.")
 endif()
-if (CAMKE_TAPI AND NOT implib STREQUAL "${foo_BUILD}/foo.framework/Versions/A/foo.tbd")
+if (CMAKE_TAPI AND NOT implib STREQUAL "${foo_BUILD}/foo.framework/Versions/A/foo.tbd")
   message(SEND_ERROR "foo-build::foo: ${implib}: wrong value for IMPORTED_IMPLIB_RELEASE.")
 endif()