From: Deepika Upadhyay <dupadhya@redhat.com>
Date: Tue, 23 Nov 2021 17:16:30 +0000 (+0530)
Subject: cmake: cleanup BuildJaeger as external project
X-Git-Tag: v17.1.0~193^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e78a4e2cea428be445b11a2f831c717c33f1d4c3;p=ceph.git

cmake: cleanup BuildJaeger as external project

replaced by Opentelemetry project, remove building and linking of jaeger
libraries.

* remove externalProject building
* linking of jaegertracing dependencies to ceph project

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
---

diff --git a/cmake/modules/BuildJaeger.cmake b/cmake/modules/BuildJaeger.cmake
deleted file mode 100644
index 5f48857fed8e..000000000000
--- a/cmake/modules/BuildJaeger.cmake
+++ /dev/null
@@ -1,85 +0,0 @@
-# This module builds Jaeger after it's dependencies are installed and discovered
-# opentelemetry: is built using cmake/modules/BuildOpentelemetry.cmake
-# Thrift: found using cmake/modules/Findthrift.cmake (not by default)
-# yaml-cpp, nlhomann-json: are installed locally and then discovered using
-# Find<package>.cmake
-# Boost Libraries: uses ceph build boost cmake/modules/BuildBoost.cmake
-
-# will do all linking and path setting
-function(set_library_properties_for_external_project _target _lib)
-  # Manually create the directory, it will be created as part of the build,
-  # but this runs in the configuration phase, and CMake generates an error if
-  # we add an include directory that does not exist yet.
-  set(_libfullname "${CMAKE_SHARED_LIBRARY_PREFIX}${_lib}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-  set(_libpath "${CMAKE_BINARY_DIR}/external/lib/${_libfullname}")
-  set(_includepath "${CMAKE_BINARY_DIR}/external/include")
-  message(STATUS "Configuring ${_target} with ${_libpath}")
-  add_library(${_target} SHARED IMPORTED)
-  add_dependencies(${_target} ${_lib})
-
-  file(MAKE_DIRECTORY "${_includepath}")
-  set_target_properties(${_target} PROPERTIES
-    INTERFACE_LINK_LIBRARIES "${_libpath}"
-    IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-    IMPORTED_LOCATION "${_libpath}"
-    INTERFACE_INCLUDE_DIRECTORIES "${_includepath}")
-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 "${CMAKE_BINARY_DIR}/external/jaegertracing")
-
-  file(MAKE_DIRECTORY "${Jaeger_INSTALL_DIR}")
-  set(Jaeger_CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-			-DBUILD_SHARED_LIBS=ON
-			-DHUNTER_ENABLED=OFF
-			-DBUILD_TESTING=OFF
-			-DJAEGERTRACING_BUILD_EXAMPLES=OFF
-			-DCMAKE_PREFIX_PATH="${CMAKE_BINARY_DIR}/external;${CMAKE_BINARY_DIR}/boost"
-			-DCMAKE_INSTALL_RPATH=${CMAKE_BINARY_DIR}/external
-			-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
-			-DOpentelemetry_DIR=${CMAKE_SOURCE_DIR}/src/jaegertracing/opentelemetry-cpp
-			-Dnlohmann_json_DIR=/usr/lib
-			-DCMAKE_FIND_ROOT_PATH=${CMAKE_BINARY_DIR}/external
-			-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/external
-			-DCMAKE_INSTALL_LIBDIR=${CMAKE_BINARY_DIR}/external/lib
-			-DBoost_INCLUDE_DIRS=${CMAKE_BINARY_DIR}/boost/include
-			-DBOOST_ROOT=${CMAKE_BINARY_DIR}/boost
-			-Dthrift_HOME=${CMAKE_BINARY_DIR}/external
-			-DOpentelemetry_HOME=${CMAKE_BINARY_DIR}/external)
-
-  # build these libraries along with jaeger
-  set(dependencies opentelemetry-cpp)
-  if(NOT WITH_SYSTEM_BOOST)
-    list(APPEND dependencies Boost)
-  endif()
-
-  include(BuildOpentelemetry)
-  build_opentelemetry()
-
-  if(CMAKE_MAKE_PROGRAM MATCHES "make")
-    # try to inherit command line arguments passed by parent "make" job
-    set(make_cmd $(MAKE) jaegertracing)
-  else()
-    set(make_cmd ${CMAKE_COMMAND} --build <BINARY_DIR> --target jaegertracing)
-  endif()
-  set(install_cmd DESTDIR= ${CMAKE_MAKE_PROGRAM} install)
-
-  include(ExternalProject)
-  ExternalProject_Add(jaegertracing
-    SOURCE_DIR ${Jaeger_SOURCE_DIR}
-    UPDATE_COMMAND ""
-    INSTALL_DIR "external"
-    PREFIX ${Jaeger_INSTALL_DIR}
-    CMAKE_ARGS ${Jaeger_CMAKE_ARGS}
-    BINARY_DIR ${Jaeger_BINARY_DIR}
-    BUILD_COMMAND ${make_cmd}
-    INSTALL_COMMAND ${install_cmd}
-    DEPENDS ${dependencies}
-    BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/external/lib/libjaegertracing.so
-    LOG_BUILD ON)
-
-  set_library_properties_for_external_project(jaegertracing::libjaegertracing
-  jaegertracing)
-endfunction()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f7efef10fdbf..442c5e9f643c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -433,19 +433,6 @@ if(WITH_JAEGER)
   build_opentelemetry()
   set(jaeger_base opentelemetry::libopentelemetry thrift::libthrift)
   add_dependencies(common-objs ${jaeger_base})
-  target_link_libraries(jaeger-base INTERFACE
-    yaml-cpp::yaml-cpp
-    opentelemetry::libopentelemetry
-    thrift::libthrift
-    jaegertracing::libjaegertracing)
-
-  list(APPEND jaeger_libs
-    ${CMAKE_BINARY_DIR}/external/lib/libjaegertracing.so.0
-    ${CMAKE_BINARY_DIR}/external/lib/libjaegertracing.so.0.6.1
-    ${CMAKE_BINARY_DIR}/external/lib/libopentracing.so.1
-    ${CMAKE_BINARY_DIR}/external/lib/libopentracing.so.1.6.0)
-  install(FILES ${jaeger_libs}
-    DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
 
 CHECK_C_COMPILER_FLAG("-fvar-tracking-assignments" HAS_VTA)