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

build release tarball when nlohmann-json not installed #1074

Merged
merged 9 commits into from
Nov 19, 2021

Conversation

esigo
Copy link
Member

@esigo esigo commented Nov 17, 2021

Fixes #981 (issue)

Changes

Please provide a brief description of the changes here.
clones nlohmann-json if not present in third_party folder.
For significant contributions please make sure you have completed the following items:

  • CHANGELOG.md updated for non-trivial changes
  • Unit tests have been added
  • Changes in public API reviewed

@codecov
Copy link

codecov bot commented Nov 17, 2021

Codecov Report

Merging #1074 (07d3d78) into main (97fbdaa) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #1074   +/-   ##
=======================================
  Coverage   94.41%   94.41%           
=======================================
  Files         158      158           
  Lines        6077     6077           
=======================================
  Hits         5737     5737           
  Misses        340      340           

@esigo esigo changed the title [WIP] build release tarball if nlohmann-json not installed [WIP] build release tarball when nlohmann-json not installed Nov 17, 2021
@esigo esigo marked this pull request as ready for review November 17, 2021 19:45
@esigo esigo requested a review from a team November 17, 2021 19:45
@esigo esigo changed the title [WIP] build release tarball when nlohmann-json not installed build release tarball when nlohmann-json not installed Nov 17, 2021
CMakeLists.txt Outdated Show resolved Hide resolved
ext/test/w3c_tracecontext_test/CMakeLists.txt Outdated Show resolved Hide resolved
if(nlohmann_json_clone)
add_dependencies(opentelemetry_exporter_otlp_http_client
nlohmann_json::nlohmann_json)
list(APPEND OPENTELEMETRY_OTLP_TARGETS nlohmann_json_)
Copy link
Member

Choose a reason for hiding this comment

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

Why is this step required?

Copy link
Member Author

Choose a reason for hiding this comment

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

it's needed for install. nlohmann_json::nlohmann_json is an alias for nlohmann_json_ here.

Copy link
Member

Choose a reason for hiding this comment

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

ok, thanks. Should that be an install target for Zipkin and ETW too, or else just have it in cmake/nlohmann-json.cmake ?

Copy link
Member Author

Choose a reason for hiding this comment

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

good idea. done

@lalitb lalitb merged commit 6e249fd into open-telemetry:main Nov 19, 2021
@esigo esigo deleted the nlohmann-json-build-tarball branch November 19, 2021 17:48
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.

Building from the release tarball fails if nlohmann-json not installed on the system
3 participants