]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: target name Jaeger >> jaegertracing
authorDeepika Upadhyay <dupadhya@redhat.com>
Wed, 21 Jul 2021 15:57:37 +0000 (21:27 +0530)
committerDeepika Upadhyay <dupadhya@redhat.com>
Thu, 22 Jul 2021 05:32:18 +0000 (11:02 +0530)
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 <dupadhya@redhat.com>
cmake/modules/BuildJaeger.cmake

index 8783a6fb7feb6c931fd671322fdf277160b8915d..cf217868919292cff782017f1db902cd2455f8ea 100644 (file)
@@ -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 <BINARY_DIR> --target Jaeger)
+    set(make_cmd ${CMAKE_COMMAND} --build <BINARY_DIR> --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"