Fix PNG support not being enabled in cjpeg (fixes #450)#455
Open
Alone-737 wants to merge 1 commit into
Open
Conversation
The COMPILE_FLAGS and CJPEG_BMP_SOURCES variables were set after the cjpeg target was already defined and were never referenced by any target, so -DPNG_SUPPORTED was never added to the cjpeg compile flags and rdpng.c was never included in the cjpeg source list. This patch: - Adds -DPNG_SUPPORTED to CDJPEG_COMPILE_FLAGS (the variable actually used by the cjpeg target) before the target is defined - Includes rdpng.c in the cjpeg executable and cjpeg12/cjpeg16 object library source lists via CJPEG_PNG_SOURCES - Consolidates the two redundant if(PNG_SUPPORTED) blocks into one for find_package and target linking
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
PNG support was broken in the shared library build because the CMake script configured the PNG flags and source files after the
cjpegtarget were already defined and used incorrect variables.FIX
-DPNG_SUPPORTEDflag to the corrected compile flags variable.rdpng.cin the source files.