Update de-vendored building for 4.4.1#596
Merged
joern274 merged 2 commits intoemsec:masterfrom Nov 4, 2024
Merged
Conversation
this also renames the vendored copy's inner directory to nlohmann to match the directory name most "installed" copies of this lib are installed under, meaning we can #include via the same path for system and vendored versions
risicle
requested review from
SimonKlx,
joern274,
julianspeith,
nils1603 and
swallat
as code owners
joern274
approved these changes
Nov 4, 2024
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
2 participants
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.
See #529
This adds the ability to de-vendor the
nlohmann_jsonlibrary. In doing so, it renames the directory it's vendored under for#includecompatibility with system-installed versions. It still builds for me in both modes.Also addresses one regression building with de-vendored igraph.