cmake: allow overriding GME_ZLIB and GME_UNRAR options by user #632
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
madebr
reviewed
Sep 5, 2024
CMakeLists.txt
Outdated
Comment on lines
704
to
709
| if(NOT DEFINED GME_ZLIB) | ||
| set(GME_ZLIB OFF) | ||
| endif() | ||
| if(NOT DEFINED GME_UNRAR) | ||
| set(GME_UNRAR OFF) | ||
| endif() |
There was a problem hiding this comment.
Would this work for you too?
Suggested change
| if(NOT DEFINED GME_ZLIB) | |
| set(GME_ZLIB OFF) | |
| endif() | |
| if(NOT DEFINED GME_UNRAR) | |
| set(GME_UNRAR OFF) | |
| endif() | |
| set(GME_ZLIB "OFF" CACHE BOOL "Build GME with zlib support") | |
| set(GME_UNRAR "OFF" CACHE BOOL "Build GME with unrar support") |
There was a problem hiding this comment.
It doesn't work for me. I am setting GME_ZLIB from the project CMakeLists.txt before including SDL_mixer.
There was a problem hiding this comment.
You need to do the following in your cmake script:
set(GME_ZLIB ON CACHE BOOL "GME with zlib" FORCE)
set(GME_UNRAR ON CACHE BOOL "GME with unrar" FORCE)There was a problem hiding this comment.
Now it works, but as user just writing:
set(GME_ZLIB ON)seems like more intuitive way for me.
There was a problem hiding this comment.
This one has a better behavior, I think.
Suggested change
| if(NOT DEFINED GME_ZLIB) | |
| set(GME_ZLIB OFF) | |
| endif() | |
| if(NOT DEFINED GME_UNRAR) | |
| set(GME_UNRAR OFF) | |
| endif() | |
| option(GME_ZLIB "GME with zlib" OFF) | |
| option(GME_UNRAR "GME with unrar" OFF) |
There was a problem hiding this comment.
Yes, this seems like a better way. Also libgme CMakeLists no longer has GME_UNRAR option.
madebr
approved these changes
Sep 5, 2024
|
Could you please merge it into SDL2 too? |
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.
I am using vendored SDL_mixer in my project and I need zlib support in libgme to load compressed VGMs. Current SDL_mixer CMake config disables it and doesn't allow user to enable it.