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

Use C++11 features supported by CMake 3.1. #1441

Merged

Conversation

iwanders
Copy link
Contributor

@iwanders iwanders commented Jan 16, 2019

This implements the proposed workaround to get the target fetaures to work on CMake versions before 3.8. I've confirmed this works on CMake 3.5.1, which is shipped with Ubuntu 16.04.

This relates to the discussion in #1428. And replaces pending PR #1440.


Pull request checklist

Read the Contribution Guidelines for detailed information.

  • Changes are described in the pull request, or an existing issue is referenced.
  • The test suite compiles and runs without error.
  • Code coverage is 100%. Test cases can be added by editing the test suite.
  • The source code is amalgamated; that is, after making changes to the sources in the include/nlohmann directory, run make amalgamate to create the single-header file single_include/nlohmann/json.hpp. The whole process is described here.

Please don't

  • The C++11 support varies between different compilers and versions. Please note the list of supported compilers. Some compilers like GCC 4.7 (and earlier), Clang 3.3 (and earlier), or Microsoft Visual Studio 13.0 and earlier are known not to work due to missing or incomplete C++11 support. Please refrain from proposing changes that work around these compiler's limitations with #ifdefs or other means.
  • Specifically, I am aware of compilation problems with Microsoft Visual Studio (there even is an issue label for these kind of bugs). I understand that even in 2016, complete C++11 support isn't there yet. But please also understand that I do not want to drop features or uglify the code just to make Microsoft's sub-standard compiler happy. The past has shown that there are ways to express the functionality such that the code compiles with the most recent MSVC - unfortunately, this is not the main objective of the project.
  • Please refrain from proposing changes that would break JSON conformance. If you propose a conformant extension of JSON to be supported by the library, please motivate this extension.
  • Please do not open pull requests that address multiple issues.

@iwanders iwanders force-pushed the support-cmake-older-than-3-8-with-if branch from c562b11 to 4fd9b52 Compare January 16, 2019 13:51
@iwanders
Copy link
Contributor Author

Had to update the PR, I didn't modify the benchmark CMakeLists. The workaround didn't work because there's some weird stuff going on in the benchmark/thirdparty folder. The main CmakeLists there requires cmake version 2.8.12, yet the cmake at the source files uses the FILTER directive on a list, which was only added in CMake 3.6.3. I chose to revert the benchmark folder to require CMake 3.8 again.

@coveralls
Copy link

coveralls commented Jan 16, 2019

Coverage Status

Coverage remained the same at 100.0% when pulling 4fd9b52 on iwanders:support-cmake-older-than-3-8-with-if into dffae10 on nlohmann:develop.

@iwanders
Copy link
Contributor Author

Reopened as per discussion on #1440

@iwanders
Copy link
Contributor Author

@nlohmann , friendly ping, this one is good for merge. @pboettch has approved this after our discussoin on #1440, that PR can be closed when this goes in.

@stale
Copy link

stale bot commented Feb 28, 2019

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the state: stale the issue has not been updated in a while and will be closed automatically soon unless it is updated label Feb 28, 2019
@iwanders
Copy link
Contributor Author

This should not be marked stale imo, we've had discussion on @1440 about this PR and decided that this is the best way of solving the problem. @pboettch has approved this a month ago. @nlohmann , if you have comments / concerns I'd be happy to address them, otherwise this can go in.

@stale stale bot removed the state: stale the issue has not been updated in a while and will be closed automatically soon unless it is updated label Feb 28, 2019
@nlohmann
Copy link
Owner

Sorry, but I am quite busy right now, so I did not find the time to check at this repo lately :-/

@iwanders
Copy link
Contributor Author

Ok, I understand, we've prevented the issue from getting closed which is good enough for today 👍

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 Mar 10, 2019
@nlohmann nlohmann added this to the Release 3.6.0 milestone Mar 10, 2019
@nlohmann nlohmann merged commit 8eb7db7 into nlohmann:develop Mar 10, 2019
@nlohmann
Copy link
Owner

Thanks a lot!!!

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.

None yet

4 participants