Skip to content

Upgrade json-cpp to 1.9.5 (plus dfhack patches) #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
May 13, 2022
Merged

Upgrade json-cpp to 1.9.5 (plus dfhack patches) #2

merged 2 commits into from
May 13, 2022

Conversation

myk002
Copy link
Member

@myk002 myk002 commented May 13, 2022 •
edited
Loading

DFHack/dfhack#2131

Incorporates patches from #1

dfhack changes:

  • Update public API in CMake to match that in the meson build spec (so the correct header files are included)
  • prefix options with JSONCPP_ (so they don't pollute the dfhack option namespace)
  • undo jsoncpp attempt to generate more warnings (so we don't break our -Werror enabled build)

@myk002 myk002 changed the base branch from dfhack to master May 13, 2022 20:25
@myk002 myk002 changed the base branch from master to dfhack May 13, 2022 20:25
@myk002 myk002 merged commit ba5eac5 into dfhack May 13, 2022
@myk002 myk002 deleted the myk_upgrade_test branch May 13, 2022 20:27
@myk002 myk002 mentioned this pull request May 13, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@myk002