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] Fix opentracing-shim when added in super project #2356

Merged

Conversation

andremarianiello
Copy link
Contributor

@andremarianiello andremarianiello commented Oct 10, 2023

Fixes #2355

Changes

Change the opentracing-shim include paths to be relative to opentelemetry-cpp directory, rather than the root cmake project directory. Those two directories will be different if opentelemetry-cpp is added to a larger project.

I also switched include_directories to target_include_directories as my understanding is that the latter is current best-practice. This necessitated gating the includes with a BUILD_INTERFACE generator expression. However, I don't think this change is required for this fix. I just wanted to improve it a little bit.

@andremarianiello andremarianiello requested a review from a team October 10, 2023 16:18
@codecov
Copy link

codecov bot commented Oct 10, 2023

Codecov Report

Merging #2356 (75ef2fe) into main (18a27df) will decrease coverage by 0.01%.
Report is 1 commits behind head on main.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2356      +/-   ##
==========================================
- Coverage   87.41%   87.39%   -0.01%     
==========================================
  Files         199      199              
  Lines        6018     6018              
==========================================
- Hits         5260     5259       -1     
- Misses        758      759       +1     

see 1 file with indirect coverage changes

@andremarianiello andremarianiello force-pushed the fix-opentracing-shim-cmake branch from b0cd683 to 56a527b Compare October 10, 2023 18:58
@andremarianiello andremarianiello force-pushed the fix-opentracing-shim-cmake branch from 56a527b to d012e9b Compare October 11, 2023 04:18
@marcalff
Copy link
Member

@owent Could you take a look ? CMake related

@marcalff marcalff merged commit 2c4b2a9 into open-telemetry:main Oct 11, 2023
44 checks passed
@andremarianiello andremarianiello deleted the fix-opentracing-shim-cmake branch October 11, 2023 18:13
@marcalff marcalff changed the title Fix behavior of opentracing-shim when added as subdirectory of a larger project [BUILD] Fix opentracing-shim when added in super project Oct 11, 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
4 participants