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.

Sign up for GitHub

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

cmake: thrift requires boost headers, include them as Boost_INCLUDE_DIRS #1100

Merged
merged 4 commits into from
Feb 4, 2022
Merged

cmake: thrift requires boost headers, include them as Boost_INCLUDE_DIRS #1100

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1cbe56
cmake: add boost as a required package
Jan 28, 2022
387a8d1
Merge branch 'main' into wip-ceph
ThomsonTan Jan 28, 2022
f71c301
cmake: include boost header files
Feb 4, 2022
cdb5e63
Merge branch 'main' into wip-ceph
lalitb Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,10 @@ endfunction()

if(WITH_JAEGER)
find_package(Thrift QUIET)
if(NOT Thrift_FOUND)
if(Thrift_FOUND)
find_package(Boost REQUIRED)
include_directories(${Boost_INCLUDE_DIR})
else()
# Install Thrift and propagate via vcpkg toolchain file
if(WIN32 AND (NOT DEFINED CMAKE_TOOLCHAIN_FILE))
install_windows_deps()
Expand Down