From 19eff9a014f4224c52144c9c7de4b73a72ca32ea Mon Sep 17 00:00:00 2001 From: Deepika Upadhyay Date: Mon, 7 Feb 2022 08:12:12 -0500 Subject: [PATCH] cmake: use BOOST_ROOT if building with system boost Signed-off-by: Deepika Upadhyay --- cmake/modules/BuildOpentelemetry.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmake/modules/BuildOpentelemetry.cmake b/cmake/modules/BuildOpentelemetry.cmake index c528273a098..ab28fa622e4 100644 --- a/cmake/modules/BuildOpentelemetry.cmake +++ b/cmake/modules/BuildOpentelemetry.cmake @@ -12,8 +12,7 @@ function(build_opentelemetry) set(opentelemetry_CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DWITH_JAEGER=ON -DBUILD_TESTING=OFF - -DWITH_EXAMPLES=OFF - -DBoost_INCLUDE_DIR=${CMAKE_BINARY_DIR}/boost/include) + -DWITH_EXAMPLES=OFF) set(opentelemetry_libs ${opentelemetry_BINARY_DIR}/sdk/src/trace/libopentelemetry_trace.a @@ -40,8 +39,11 @@ function(build_opentelemetry) ${opentelemetry_cpp_targets}) endif() - if(NOT WITH_SYSTEM_BOOST) + if(WITH_SYSTEM_BOOST) + list(APPEND opentelemetry_CMAKE_ARGS -DBOOST_ROOT=${BOOST_ROOT}) + else() list(APPEND dependencies Boost) + list(APPEND opentelemetry_CMAKE_ARGS -DBoost_INCLUDE_DIR=${CMAKE_BINARY_DIR}/boost/include) endif() include(ExternalProject) -- 2.47.3