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

meson: fix include directory #1142

Merged
merged 2 commits into from Jun 24, 2018
Merged

meson: fix include directory #1142

merged 2 commits into from Jun 24, 2018

Conversation

ghost
Copy link

@ghost ghost commented Jun 23, 2018

Currently Meson exports single_include/nlohmann as include directory.
The compiler flag -I…/nlohmann_json/single_include/nlohmann is generated.
According to the documentation, this is how you should include it:

#include <nlohmann/json.hpp>

This does not work currently, but #include <json.hpp> does.

The correct flag directory is -I…/nlohmann_json/single_include and this commit fixes the Meson file.

@coveralls
Copy link

coveralls commented Jun 23, 2018

Coverage Status

Coverage remained the same at 100.0% when pulling ec2ebd5 on jrakow:develop into 6245772 on nlohmann:develop.

@theodelrieu
Copy link
Contributor

Thanks!

While I'm thinking about it, could you add the support for the multiple header version as well?

@ghost
Copy link
Author

ghost commented Jun 24, 2018

Done.
The first commit is technically a breaking change, but it is a fix, so I think it is OK.

Also, I maybe should have skipped CI.

@nlohmann
Copy link
Owner

Sorry, I messed up the AppVeyor build. I'll let you know once I fixed it.

@nlohmann
Copy link
Owner

I fixed AppVeyor - @jrakow could you please update your PR to the latest appveyor.yml file?

@ghost
Copy link
Author

ghost commented Jun 24, 2018

Rebased.
Checks have passed.

Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@nlohmann nlohmann self-assigned this Jun 24, 2018
@nlohmann nlohmann added this to the Release 3.1.3 milestone Jun 24, 2018
@nlohmann nlohmann merged commit 515cfc2 into nlohmann:develop Jun 24, 2018
@nlohmann
Copy link
Owner

Thanks!

@nlohmann
Copy link
Owner

nlohmann commented Jul 1, 2018

@jrakow I am currently overworking the documentation. Thereby, I wanted to provide examples on how to use the different package managers. Unfortunately, I fail to use meson. The documentation

If you are using the Meson Build System, then you can wrap this repository as a subproject.

is very tense. As you recently propose a change to the meson.build file, I hope you could give me a brief idea how I would be able to translate a small example C++ file that uses the library.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants