From 2eea50800e89adf8ff37328119b4dce1b5d7b2de Mon Sep 17 00:00:00 2001 From: Deepika Upadhyay Date: Wed, 21 Jul 2021 21:27:37 +0530 Subject: [PATCH] cmake: target name Jaeger >> jaegertracing since jaegertracing is the original target that jaeger submodule uses in it's cmake, cmake build complained if named otherwise Signed-off-by: Deepika Upadhyay --- cmake/modules/BuildJaeger.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/modules/BuildJaeger.cmake b/cmake/modules/BuildJaeger.cmake index 8783a6fb7feb6..cf21786891929 100644 --- a/cmake/modules/BuildJaeger.cmake +++ b/cmake/modules/BuildJaeger.cmake @@ -30,7 +30,7 @@ endfunction() function(build_jaeger) set(Jaeger_SOURCE_DIR "${CMAKE_SOURCE_DIR}/src/jaegertracing/jaeger-client-cpp") set(Jaeger_INSTALL_DIR "${CMAKE_BINARY_DIR}/external") - set(Jaeger_BINARY_DIR "${Jaeger_INSTALL_DIR}/Jaeger") + set(Jaeger_BINARY_DIR "${CMAKE_BINARY_DIR}/external/jaegertracing") file(MAKE_DIRECTORY "${Jaeger_INSTALL_DIR}") set(Jaeger_CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON @@ -58,14 +58,14 @@ function(build_jaeger) if(CMAKE_MAKE_PROGRAM MATCHES "make") # try to inherit command line arguments passed by parent "make" job - set(make_cmd $(MAKE) Jaeger) + set(make_cmd $(MAKE) jaegertracing) else() - set(make_cmd ${CMAKE_COMMAND} --build --target Jaeger) + set(make_cmd ${CMAKE_COMMAND} --build --target jaegertracing) endif() set(install_cmd ${CMAKE_MAKE_PROGRAM} install) include(ExternalProject) - ExternalProject_Add(Jaeger + ExternalProject_Add(jaegertracing SOURCE_DIR ${Jaeger_SOURCE_DIR} UPDATE_COMMAND "" INSTALL_DIR "external" -- 2.39.5