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

Thirdparty benchmark: Fix Clang detection. #1277

Merged
merged 1 commit into from
Oct 6, 2018
Merged

Thirdparty benchmark: Fix Clang detection. #1277

merged 1 commit into from
Oct 6, 2018

Conversation

Lord-Kamina
Copy link
Contributor

CMake 3.0+ refers to macOS’ Clang as AppleClang, which would fail a STREQUAL check. Fixed by changing it to MATCHES.


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.

CMake 3.0+ refers to macOS’ Clang as AppleClang, which would fail a STREQUAL check. Fixed by changing it to MATCHES.
@nlohmann
Copy link
Owner

nlohmann commented Oct 5, 2018

The code we use is some release of Google Benchmarks (https://github.com/google/benchmark/releases). Your fix should (also) be added there, and maybe it is already fixed there in a new release.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling e842706 on performous:fix-clang-detection into b911654 on nlohmann:develop.

@Lord-Kamina
Copy link
Contributor Author

Lord-Kamina commented Oct 5, 2018

A quick look at master says it hasn't been fixed upstream. I guess I'll submit it over there also.

EDIT: Submitted upstream already also. google/benchmark#697

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 Oct 6, 2018
@nlohmann nlohmann added this to the Release 3.3.1 milestone Oct 6, 2018
@nlohmann nlohmann merged commit ac38e95 into nlohmann:develop Oct 6, 2018
@nlohmann
Copy link
Owner

nlohmann commented Oct 6, 2018

Thanks!

@Lord-Kamina Lord-Kamina deleted the fix-clang-detection branch May 6, 2020 07:58
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