mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9750
This commit is contained in:
Brad King
2024-08-20 15:24:37 +00:00
committed by Kitware Robot
parent 42fb178506 7402593a08
commit 9570ff0c7c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindJNI.cmake
View File

@@ -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 "")