Bring Meson build definition more in line with CMake #4452
+47
−13
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
for better readability
Without a version set meson will give no developer warnings, including deprecations. 0.64 was selected as it's quite old, it's the newest version supported by muon (a pure C Meson implementation), and there's nothing complicated going on here.
This simplifies the use of json as a subproject.
This makes a single call to install the entire directory, and doesn't need an update if any new headers are added. It also will simplify bringing the Meson and CMake builds into allignment on how they handle the multi-header vs single-header setups.
Matching the CMake as closely as possible, as Meson doesn't have C++11 feature checks like CMAke does.
dcbaker
force-pushed
the
submit/meson-updates
branch
from
138d391
to
641e353
Compare
gregmarr
reviewed
Sep 9, 2024
dcbaker
force-pushed
the
submit/meson-updates
branch
from
641e353
to
5b5adfe
Compare
This uses a meson option (set in `meson_options.txt`) to control whether multi-header or single-header setup is wanted.
dcbaker
force-pushed
the
submit/meson-updates
branch
from
5b5adfe
to
b65e362
Compare
|
Is meson_options.txt really needed? If so, can it be moved into a subdirectory? |
|
Meson options must be specified in a |
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.
Update the Meson build definition to use Meson best practices, and bring into alignment with the CMake build files.
Particularly, This changes the meson build to only expose a single target, like the CMake does, controlled by an option with the same name. It additionally exposes the
GlobalUDLsandImplicitConversionsoptions, which have behavioral implementations a consumer may wish to control. I have not exposed other options as they don't seem to be important for behavior.The options names do not have the
JSON_prefix, and Meson already has (sub)project option namespaces, so addingJSON_would worse (-Dnlohmann_json:ImplicitConversionsvs-Dnlohmann_json:JSON_ImplicitConversions).Pull request checklist
Read the Contribution Guidelines for detailed information.
include/nlohmanndirectory, runmake amalgamateto create the single-header filessingle_include/nlohmann/json.hppandsingle_include/nlohmann/json_fwd.hpp. The whole process is described here.