Fix: zlib fallback not working #772
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
Scrumplex
reviewed
Jan 22, 2023
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
TheLastRar
force-pushed
the
zlib-fallback-bundled-fix
branch
from
4e63f43
to
2a949fc
Compare
Scrumplex
added a commit
that referenced
this pull request
Feb 2, 2023
Fix: zlib fallback not working
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.
Description of Changes
When
Launcher_FORCE_BUNDLED_LIBSis not defined, the zlib submodule will fail to load due to the nature of cached values and find_package.This can be fixed by forcing
ZLIB_INCLUDE_DIR, however subsequent configurations will cause builds to fail as the first find_package will succeed due to cached variables.Add a new cmake cached variable
FORCE_BUNDLED_ZLIBwhich gets set when bundled zlib is required, which is checked on subsequent configurations to ensure the zlib submodule is correctly loaded.Suggested Testing Steps
Test cmake configuration & build without a system installed zlib, and without
Launcher_FORCE_BUNDLED_LIBS.Reconfigure cmake & build to ensure subsequent configurations still function.
Check CI.