Browse Source

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

7402593a08 FindJNI: Improve output on macOS if Xcode is not installed

Acked-by: Kitware Robot <[email protected]>
Merge-request: !9750
Brad King 1 year ago
parent
commit
9570ff0c7c
1 changed files with 3 additions and 1 deletions
  1. 3 1
      Modules/FindJNI.cmake

+ 3 - 1
Modules/FindJNI.cmake

@@ -391,8 +391,10 @@ if(APPLE)
     execute_process(
       COMMAND xcodebuild -version
       OUTPUT_VARIABLE _FindJNI_XCODEBUILD_VERSION
+      ERROR_VARIABLE _FindJNI_XCODEBUILD_VERSION
+      RESULT_VARIABLE _FindJNI_XCODEBUILD_RESULT
       )
-    if(_FindJNI_XCODEBUILD_VERSION MATCHES "Xcode ([0-9]+(\\.[0-9]+)*)")
+    if(_FindJNI_XCODEBUILD_RESULT EQUAL 0 AND _FindJNI_XCODEBUILD_VERSION MATCHES "Xcode ([0-9]+(\\.[0-9]+)*)")
       set(_FindJNI_XCODE_VERSION "${CMAKE_MATCH_1}")
     else()
       set(_FindJNI_XCODE_VERSION "")