From 55ffcd189388ecba69e89a27d948fa5e91d25238 Mon Sep 17 00:00:00 2001 From: reuk Date: Mon, 8 Mar 2021 17:35:27 +0000 Subject: [PATCH] CMake: Use CMAKE_OSX_SYSROOT to locate AU/Rez files This change should allow CMake builds to work with either a full Xcode install, or a CommandLineTools-only install. --- extras/Build/CMake/JUCEUtils.cmake | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake index 7f6c910f16..87929c467c 100644 --- a/extras/Build/CMake/JUCEUtils.cmake +++ b/extras/Build/CMake/JUCEUtils.cmake @@ -418,26 +418,13 @@ function(_juce_add_au_resource_fork shared_code_target au_target) DEPENDS "${defs_file}" VERBATIM) - execute_process(COMMAND xcode-select -p - OUTPUT_VARIABLE xcode_developer_path - RESULT_VARIABLE result_variable) - - if(result_variable) - message(FATAL_ERROR - "Failed to locate an active developer directory. " - "Run 'xcode-select -s ' before reconfiguring.") - endif() - - string(STRIP "${xcode_developer_path}" xcode_developer_path) - add_custom_command(OUTPUT "${au_rez_output}" COMMAND "${JUCE_XCRUN}" Rez -d "ppc_$ppc" -d "i386_$i386" -d "ppc64_$ppc64" -d "x86_64_$x86_64" -I "${secret_au_resource_dir}" -I "/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Versions/A/Headers" - -I "${xcode_developer_path}/Extras/CoreAudio/AudioUnits/AUPublic/AUBase" - -I "${xcode_developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AudioUnit.framework/Headers" - -isysroot "${xcode_developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" + -I "${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/AudioUnit.framework/Headers" + -isysroot "${CMAKE_OSX_SYSROOT}" "${au_rez_sources}" -useDF -o "${au_rez_output}"