Browse Source

Merge topic 'FindJNI-no-xcode' into release-3.27

597139b853 FindJNI: Restore support for macOS without Xcode

Acked-by: Kitware Robot <[email protected]>
Merge-request: !8707
Brad King 2 years ago
parent
commit
24cc66af21
1 changed files with 9 additions and 5 deletions
  1. 9 5
      Modules/FindJNI.cmake

+ 9 - 5
Modules/FindJNI.cmake

@@ -388,11 +388,15 @@ if(APPLE)
   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)