CMake: Fix building against macOS framework builds of SDL #11710
Conversation
This file contains 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
Allows INTERFACE_LINK_OPTIONS to propagate through private dependencies, required by MacOS framework builds of SDL2
It doesn't properly set the include paths for macos framework builds of SDL, and SDL has had its own find script since 2.0.10
|
Could you drop the CI test commit now that the build machine has been fixed? |
TellowKrinkle
force-pushed
the
SDL2Framework
branch
from
73ef067
to
0d4a527
Compare
|
These changes LGTM, though I'd like someone more familiar with CMake to comment on the note. |
|
I'm not super familiar with CMake either, but enabling all policies seems like an easy way to subtly change behavior in an unnoticeable way, so probably not ideal. Someone would probably need to go through them one by one and see if any could be problematic, and only if they're confirmed not to be enable them. |
|
@dolphin-emu-bot rebuild (testing new buildbot config before merging) |
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.
Our find script wasn't compatible with SDL's framework builds. SDL has shipped with a CMake find script since 2.0.10, and hopefully no one is trying to use an SDL older than that, so I just removed the find script.
In addition, the framework build's find script supplies its link arguments with
INTERFACE_LINK_OPTIONS, which didn't propagate across private dependencies until CMake 3.17 with CMP0099 enabled.Note: An alternative to manually enabling these policies would be to mass enable all policies introduced up to 3.26 (when supported) with
cmake_minimum_required(VERSION 3.13...3.26). Preferences?