Skip to content
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.

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

Externalize nlohmann #57935

Merged
merged 1 commit into from
Jun 30, 2024
Merged

Externalize nlohmann #57935

merged 1 commit into from
Jun 30, 2024

Conversation

m-kuhn
Copy link
Member

@m-kuhn m-kuhn commented Jun 29, 2024

nlohmann_json is used in many different styles throughout the codebase. This cleans things up and makes it possible to use a system provided copy.

Adds a new cmake flag WITH_INTERNAL_NLOHMANN_JSON which is enabled by default for backwards compatibility.

@github-actions github-actions bot added this to the 3.40.0 milestone Jun 29, 2024
Copy link

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit c268fb1)

@nyalldawson
Copy link
Collaborator

@m-kuhn is it worth switching either the qt5 or qt6 ci build to use the system library? (So that we get test coverage of both setups)

@m-kuhn
Copy link
Member Author

m-kuhn commented Jun 30, 2024

Will be done with vcpkg #57414

@m-kuhn m-kuhn merged commit efd29ee into qgis:master Jun 30, 2024
32 checks passed
@m-kuhn m-kuhn deleted the externalize_nlohmann_json branch June 30, 2024 04:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants