Skip to content

Commit

Permalink
Fix cmake find thrift when vcpkg is used (open-telemetry#1022)
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomsonTan authored Oct 21, 2021
1 parent 23476e3 commit 368f172
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ project(opentelemetry-cpp)
# Mark variables as used so cmake doesn't complain about them
mark_as_advanced(CMAKE_TOOLCHAIN_FILE)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
# Don't use customized cmake modules if vcpkg is used to resolve dependence.
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
endif()

if(DEFINED ENV{ARCH})
# Architecture may be specified via ARCH environment variable
Expand Down

0 comments on commit 368f172

Please sign in to comment.