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

Cleanup CMake makefiles for nlohmann_json. #1912

Merged
merged 3 commits into from
Jan 10, 2023

Conversation

marcalff
Copy link
Member

@marcalff marcalff commented Jan 10, 2023

Fixes #1910

Changes

Moved nlohmann_json dependency logic to cmake/nlohmann-json.cmake

No behavior change.

Added documentation for various ways to add the nlohmann_json dependency.

  • CHANGELOG.md updated for non-trivial changes
  • Unit tests have been added
  • Changes in public API reviewed (N/A)
  • Tested local build using a package
  • Tested local build using git submodules
  • Tested local build using github download

@marcalff marcalff requested a review from a team January 10, 2023 14:51
@marcalff marcalff marked this pull request as draft January 10, 2023 14:51
@marcalff marcalff marked this pull request as ready for review January 10, 2023 16:13
@codecov
Copy link

codecov bot commented Jan 10, 2023

Codecov Report

Merging #1912 (c1f91e0) into main (8a9d085) will decrease coverage by 0.06%.
The diff coverage is n/a.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1912      +/-   ##
==========================================
- Coverage   85.78%   85.72%   -0.05%     
==========================================
  Files         171      171              
  Lines        5252     5252              
==========================================
- Hits         4505     4502       -3     
- Misses        747      750       +3     
Impacted Files Coverage Δ
ext/src/http/client/curl/http_client_curl.cc 80.31% <0.00%> (-1.13%) ⬇️

Copy link
Member

@lalitb lalitb left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks you, this make root CMakeLists.txt much cleaner.

it is still in used in:
  test/w3c_tracecontext_test/CMakeLists.txt:  if(nlohmann_json_clone)
@lalitb lalitb merged commit 65c22e9 into open-telemetry:main Jan 10, 2023
@marcalff marcalff deleted the fix_cmake_json_1910 branch July 4, 2023 07:20
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.

[Build] CMake code related to nlohmann_json needs cleanup and documentation
3 participants