Fix macOS CI again #2079
Merged
Fix macOS CI again #2079
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
Instead of relying on variables defined in the FindSDL2_mixer module, create an IMPORTED target. This allows any overriding system SDL2_mixerConfig to add additional properties needed for the build to succeed. This might help with bugs with vcpkg/macOS.
vcpkg provides an SDL2_mixerConfig.cmake file that works better than our FindSDL2_mixer.cmake. Ensure that CMake uses the better file. Also stop trying to target macOS 11 as vcpkg ignores this when building some dependencies (upstream bug; microsoft/vcpkg#10038).
SDL2_mixerConfig.cmake uses the lowercase SDL2_mixer prefix and our FindSDL2_mixer module was defining uppercase variables with the uppercase SDL2_MIXER prefix. Harmonize to the upstream convention.
lmoureaux
force-pushed
the
bugfix/macos-ci
branch
from
ce07688
to
63df22d
Compare
|
I hope this version is good to merge |
jwrober
approved these changes
Dec 24, 2023
SDL2_mixer is used in a wholly different way on emscripten, so the following confusing output is printed: I can see that it's building |
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.
Use the
SDL2_mixerConfig.cmakeprovided by SDL2_mixer on macOS instead of ourFindSDL2_mixer.cmake. Document the find module as being there only to support older library versions.