CMake: respect externally-set CMAKE_OSX_SYSROOT on macOS (v2-3)#570
Draft
taylorhoward92 wants to merge 1 commit intoOGRECave:v2-3from
Draft
CMake: respect externally-set CMAKE_OSX_SYSROOT on macOS (v2-3)#570taylorhoward92 wants to merge 1 commit intoOGRECave:v2-3from
taylorhoward92 wants to merge 1 commit intoOGRECave:v2-3from
Conversation
The macOS build section unconditionally overrides CMAKE_OSX_SYSROOT, either via xcodebuild or a hardcoded "macosx" value. This prevents package managers and cross-compilation setups from providing their own SDK path. Guard the CMAKE_OSX_SYSROOT assignments with if(NOT CMAKE_OSX_SYSROOT) so auto-detection only runs as a fallback. XCODE_ATTRIBUTE_SDKROOT remains unconditional as it is a harmless Xcode project attribute.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The macOS (non-iOS) build section unconditionally sets
CMAKE_OSX_SYSROOTviaxcodebuild -version -sdk(Unix Makefiles)or
set(CMAKE_OSX_SYSROOT macosx)(other generators). This overridesany externally-provided sysroot, breaking builds that need a specific
SDK path (package managers like Nix/Homebrew, cross-compilation setups).
Changes
Wrap the
CMAKE_OSX_SYSROOTassignments inif(NOT CMAKE_OSX_SYSROOT)so auto-detection only runs when no sysroot has been set externally.
set(XCODE_ATTRIBUTE_SDKROOT macosx)is left outside the guard — it'sa non-harmful Xcode project attribute that doesn't affect the actual
SDK path resolution.
Test plan
runs as before (no behavior change)
-DCMAKE_OSX_SYSROOT=/path/to/sdk— theprovided value is respected