Tweak USE_SYSTEM_xxx support #403
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
res2k
referenced
this pull request
Apr 17, 2024
runlevel5
approved these changes
Apr 17, 2024
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.
The
USE_SYSTEM_xxxlogic wasn't always picking up the libs - see e.g. b8fd774#r141076760In general, comparing the CMake module documentation with what the "package find" mechanism would provide, and what was actually linked, it seems those were actually "direct library links" instead of CMake target links.
Anyhow, I changed the CMake targets around a bit to get "wrapper" targets that pull in either the documented outputs from CMake's module detection (if "system lib" was chosen), or the "extern" library as produced "in build".
This has also the benefit that consumers of libs don't have to concern themselves with knowing which variant is taken, making src/CMakeLists.txt a bit cleaner.