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

Allow to build WITH_JAEGER in Visual Studio 2019 + CMake #815

Merged
merged 4 commits into from
Jun 2, 2021

Conversation

maxgolov
Copy link
Contributor

@maxgolov maxgolov commented Jun 2, 2021

Changes

Can't build WITH_JAEGER on Windows via Visual Studio 2019, and/or via tools/build.cmd

Changes:

  • install Thrift via vcpkg in setup-buildtools.cmd
  • add Thrift detection logic in the main CMakeLists.txt
  • respect the path that is auto-detected by vcpkg-installed Thrift : it's 1-level up from what thrift-gen is expecting, i.e. the include dir name contains thrift/ but the code also includes thrift/*.h, so we need to append a dir that's 1-level up to make thrift-gen happy.

These changes allow to build WITH_JAGER on Windows.

UNRELATED ISSUE: Thrift is extremely bulky and requires Boost.. takes quite a bit of time to build.

maxgolov added 3 commits June 1, 2021 17:05
Can't build WITh_JAEGER on Windows because Thrift was not installed in Visual Studio 2019 and `tools/build.cmd` build
vcpkg installed Thrift points to .\thrift whereas thrift-gen expects path 1-level up
Install Thrift as it is required for Jaeger exporter
@maxgolov maxgolov requested a review from a team June 2, 2021 00:11
@codecov
Copy link

codecov bot commented Jun 2, 2021

Codecov Report

Merging #815 (fd759f0) into main (5767f8e) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #815   +/-   ##
=======================================
  Coverage   96.19%   96.19%           
=======================================
  Files         153      153           
  Lines        6444     6444           
=======================================
  Hits         6198     6198           
  Misses        246      246           

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 for the fix.

@lalitb lalitb merged commit 1c70f0e into main Jun 2, 2021
@lalitb lalitb deleted the maxgolov/vcpkg_thrift branch June 2, 2021 19:13
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