Respect USE_SYSTEM_FMTLIB #5429
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
calcmogul
reviewed
Jul 9, 2023
| @@ -100,7 +100,7 @@ file(GLOB_RECURSE wpiutil_windows_src src/main/native/windows/*.cpp) | |||
| file(GLOB fmtlib_native_src src/main/native/thirdparty/fmtlib/src/*.cpp) | |||
| file(GLOB_RECURSE memory_native_src src/main/native/thirdparty/memory/src/*.cpp) | |||
|
|
|||
| add_library(wpiutil ${wpiutil_native_src} ${fmtlib_native_src} ${memory_native_src} ${wpiutil_resources_src}) | |||
| add_library(wpiutil ${wpiutil_native_src} ${memory_native_src} ${wpiutil_resources_src}) | |||
There was a problem hiding this comment.
That breaks builds that don't use a system install of fmtlib.
There was a problem hiding this comment.
the target_sources line below doesn't address that issue?
There was a problem hiding this comment.
It is added here:
allwpilib/wpiutil/CMakeLists.txt
Lines 121 to 122 in d37f990
PeterJohnson
approved these changes
Jul 9, 2023
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.
Fixes #5428