Skip to content

[BUILD] Fix if JSON library already added another CMake target#2126

Merged
ThomsonTan merged 1 commit intoopen-telemetry:mainfrom
cngzhnp:fix/json_as_cmake_target
May 3, 2023
Merged

[BUILD] Fix if JSON library already added another CMake target#2126
ThomsonTan merged 1 commit intoopen-telemetry:mainfrom
cngzhnp:fix/json_as_cmake_target

Conversation

@cngzhnp
Copy link
Copy Markdown
Contributor

@cngzhnp cngzhnp commented Apr 29, 2023

Fixes #1879

Changes

Please provide a brief description of the changes here.

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
Copy Markdown

codecov bot commented Apr 29, 2023

Codecov Report

Merging #2126 (d83f01b) into main (2fd3d35) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #2126   +/-   ##
=======================================
  Coverage   87.19%   87.19%           
=======================================
  Files         166      166           
  Lines        4784     4784           
=======================================
  Hits         4171     4171           
  Misses        613      613           

@cngzhnp cngzhnp marked this pull request as ready for review April 29, 2023 20:37
@cngzhnp cngzhnp requested a review from a team April 29, 2023 20:37
Comment thread cmake/nlohmann-json.cmake
Copy link
Copy Markdown
Member

@owent owent left a comment

Choose a reason for hiding this comment

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

LGTM and thanks.

@ThomsonTan ThomsonTan merged commit 8c75041 into open-telemetry:main May 3, 2023
@marcalff marcalff changed the title Fix if JSON library already added another CMake target [BUILD] Fix if JSON library already added another CMake target May 23, 2023
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.

Nlohmann library can cause conflict on CMake targets during build

4 participants