Do not allow libyuv to find_package JPEG #2473
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
maryla-uc
approved these changes
Oct 9, 2024
wantehchang
reviewed
Oct 9, 2024
| @@ -29,17 +29,26 @@ else() | |||
| if(ANDROID_ABI) | |||
| set(LIBYUV_BINARY_DIR "${LIBYUV_BINARY_DIR}/${ANDROID_ABI}") | |||
| endif() | |||
|
|
|||
| # unset JPEG_FOUND so that libyuv does not find it | |||
There was a problem hiding this comment.
Nit: Thanks for the fix. It would good to explain why we need to do this.
| @@ -29,17 +29,26 @@ else() | |||
| if(ANDROID_ABI) | |||
| set(LIBYUV_BINARY_DIR "${LIBYUV_BINARY_DIR}/${ANDROID_ABI}") | |||
| endif() | |||
|
|
|||
| # unset JPEG_FOUND so that libyuv does not find it | |||
| set(JPEG_FOUND_ORIG ${JPEG_FOUND}) | |||
There was a problem hiding this comment.
If JPEG_FOUND is originally undefined, won't line 48 cause it to be set to an empty string (which is a false constant)?
If no code tests the DEFINED JPEG_FOUND condition, then this is fine.
There was a problem hiding this comment.
Internal CMake does not care about JPEG_FOUND being set to empty at least. If you look into FindJPEG.cmake on your machine, it looks for libraries and includes to fill the JPEG_FOUND variable, whether it has been set before or not using find_package_handle_standard_args.
So we are safe
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.
This is a better solution to the patch workaround