1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call xcrun from PATH

Browse Source 
The xcrun binary may be installed in a different location when cross
compiling to macOS using osxcross.

Change-Id: I47398e8da19c42e5e9d1b595673048c56662ea2e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Joni Poikelin 2025-03-31 12:48:59 +03:00 committed by Tor Arne Vestbø
parent b145f23770
commit 80d680e82f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtPublicAppleHelpers.cmake
View File

@ -822,7 +822,7 @@ function(_qt_internal_get_apple_sdk_version out_var)
set(sdk_name "macosx") set(sdk_name "macosx")
endif() endif()
set(xcrun_version_arg "--show-sdk-version") set(xcrun_version_arg "--show-sdk-version")
execute_process(COMMAND /usr/bin/xcrun --sdk ${sdk_name} ${xcrun_version_arg} execute_process(COMMAND xcrun --sdk ${sdk_name} ${xcrun_version_arg}
OUTPUT_VARIABLE sdk_version OUTPUT_VARIABLE sdk_version
ERROR_VARIABLE xcrun_error) ERROR_VARIABLE xcrun_error)
if(NOT sdk_version) if(NOT sdk_version)
@ -836,7 +836,7 @@ endfunction()
function(_qt_internal_get_xcode_version_raw out_var) function(_qt_internal_get_xcode_version_raw out_var)
if(APPLE) if(APPLE)
execute_process(COMMAND /usr/bin/xcrun xcodebuild -version execute_process(COMMAND xcrun xcodebuild -version
OUTPUT_VARIABLE xcode_version OUTPUT_VARIABLE xcode_version
ERROR_VARIABLE xcrun_error) ERROR_VARIABLE xcrun_error)
string(REPLACE "\n" " " xcode_version "${xcode_version}") string(REPLACE "\n" " " xcode_version "${xcode_version}")