Adjustments for finding SFML #1761
Merged
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
- SFML 2.5 and newer install a CMake config module so FindSFML.cmake is no longer needed. - Additionally detect SFML 3 vs SFML 2 and use the correct target names for linking.
|
I think for now we prefer SFML 2, likely will be a while until 3 is more generally available anyway. |
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.
As noted in #1759 (comment), it's reasonable to expect that distros are shipping a version of SFML new enough to have the config module in place. Therefore we can remove FindSFML.cmake. I see that you were already using the config module on Windows so this ultimately normalizes both sides there.
I also noticed that SFML 3 changed the target names and capitalization of components so it's not backwards compatible. I've added a bit to try SFML 2 and if not found try with SFML 3 names. Note that I went this direction due to #1759 indicating that SFML 3 support may need time to bake. It marginally simpler (one line, one less variable) to prefer SFML 3 if you want to go that route.