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

Upgrade Hunter to get newer nlohmann_json #736

Merged
merged 1 commit into from
Feb 16, 2021
Merged

Conversation

gumb0
Copy link
Collaborator

@gumb0 gumb0 commented Feb 16, 2021

Required for #716

Older version of nlohmann_json has some compilation errors when <any> is included, see #716 (comment) for links.

@codecov
Copy link

codecov bot commented Feb 16, 2021

Codecov Report

Merging #736 (b37a7d5) into master (a58c3df) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #736   +/-   ##
=======================================
  Coverage   99.35%   99.35%           
=======================================
  Files          73       73           
  Lines       11388    11388           
=======================================
  Hits        11315    11315           
  Misses         73       73           
Flag Coverage Δ
rust 99.85% <ø> (ø)
spectests 90.84% <ø> (ø)
unittests 99.32% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@gumb0 gumb0 requested review from chfast and axic February 16, 2021 11:55
@chfast chfast changed the title Upgrade HunterGate to get newer nlohmann_json Upgrade Hunter to get newer nlohmann_json Feb 16, 2021
@@ -2,6 +2,4 @@
hunter_config(
benchmark
VERSION 1.5.0
URL https://github.com/google/benchmark/archive/v1.5.0.tar.gz
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why is this removed? If we get benchmark 1.5.0 by default you can remove all of it.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, it's default.

Should I leave this file empty? It complains if I delete it:

-- Build type: Debug

[hunter ** FATAL ERROR **] Config not found: /home/andrei/dev/fizzy/cmake/Hunter/config.cmake
[hunter ** FATAL ERROR **] [Directory:/home/andrei/dev/fizzy/test]

------------------------------ ERROR -----------------------------
    https://hunter.readthedocs.io/en/latest/reference/errors/error.incorrect.input.data.html
------------------------------------------------------------------

CMake Error at /home/andrei/.hunter/_Base/Download/Hunter/0.23.294/0dd1ee8/Unpacked/cmake/modules/hunter_error_page.cmake:12 (message):
Call Stack (most recent call first):
  /home/andrei/.hunter/_Base/Download/Hunter/0.23.294/0dd1ee8/Unpacked/cmake/modules/hunter_fatal_error.cmake:20 (hunter_error_page)
  /home/andrei/.hunter/_Base/Download/Hunter/0.23.294/0dd1ee8/Unpacked/cmake/modules/hunter_user_error.cmake:7 (hunter_fatal_error)
  /home/andrei/.hunter/_Base/Download/Hunter/0.23.294/0dd1ee8/Unpacked/cmake/modules/hunter_set_config_location.cmake:50 (hunter_user_error)
  /home/andrei/.hunter/_Base/Download/Hunter/0.23.294/0dd1ee8/Unpacked/cmake/modules/hunter_apply_gate_settings.cmake:85 (hunter_set_config_location)
  /home/andrei/.hunter/_Base/Download/Hunter/0.23.294/0dd1ee8/Unpacked/cmake/modules/hunter_finalize.cmake:73 (hunter_apply_gate_settings)
  /home/andrei/.hunter/_Base/Download/Hunter/0.23.294/0dd1ee8/Unpacked/cmake/modules/hunter_add_package.cmake:23 (hunter_finalize)
  test/CMakeLists.txt:16 (hunter_add_package)


-- Configuring incomplete, errors occurred!
See also "/home/andrei/dev/fizzy/build/CMakeFiles/CMakeOutput.log".
See also "/home/andrei/dev/fizzy/build/CMakeFiles/CMakeError.log".

Copy link
Collaborator

Choose a reason for hiding this comment

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

You can remove the file if you also remove the LOCAL option from HunterGate().

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done, thanks.

@gumb0 gumb0 merged commit 978073a into master Feb 16, 2021
@gumb0 gumb0 deleted the update-huntergate branch February 16, 2021 16:32
@gumb0 gumb0 mentioned this pull request Feb 24, 2021
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.

3 participants