ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/oatpp-curl/fix-find-curl.patch

   1 diff --git a/CMakeLists.txt b/CMakeLists.txt
   2 index 85edfe7..a8aa02b 100644
   3 --- a/CMakeLists.txt
   4 +++ b/CMakeLists.txt
   5 @@ -94,7 +94,7 @@ message("## ${OATPP_THIS_MODULE_NAME} module. Resolving dependencies...\n")
   6
   7  ##############################
   8  ## Find libcurl dependency
   9 -
  10 +if(0)
  11  include(FindPkgConfig)
  12  pkg_check_modules(PKG_CURL REQUIRED libcurl)
  13
  14 @@ -103,9 +103,10 @@ message("[libcurl] LIBRARIES=${PKG_CURL_LIBRARIES}")
  15  message("[libcurl] LIBRARY_DIRS=${PKG_CURL_LIBRARY_DIRS}")
  16  message("[libcurl] INCLUDE_DIRS=${PKG_CURL_INCLUDE_DIRS}")
  17  message("[libcurl] VERSION=${PKG_CURL_VERSION}\n")
  18 -
  19 +endif()
  20 +find_package(CURL CONFIG REQUIRED)
  21  link_directories(
  22 -        ${PKG_CURL_LIBRARY_DIRS}
  23 +        CURL::libcurl
  24  )
  25
  26  message("\n############################################################################\n")
  27 diff --git a/cmake/module-config.cmake.in b/cmake/module-config.cmake.in
  28 index 5cc12b0..4ff34bc 100644
  29 --- a/cmake/module-config.cmake.in
  30 +++ b/cmake/module-config.cmake.in
  31 @@ -1,5 +1,6 @@
  32  @PACKAGE_INIT@
  33 -
  34 +include(CMakeFindDependencyMacro)
  35 +find_dependency(CURL)
  36  if(NOT TARGET oatpp::@OATPP_MODULE_NAME@)
  37      include("${CMAKE_CURRENT_LIST_DIR}/@OATPP_MODULE_NAME@Targets.cmake")
  38  endif()
  39 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
  40 index 8c2087f..1da41c6 100644
  41 --- a/src/CMakeLists.txt
  42 +++ b/src/CMakeLists.txt
  43 @@ -43,7 +43,7 @@ target_include_directories(${OATPP_THIS_MODULE_NAME}
  44  #)
  45
  46  target_link_libraries(${OATPP_THIS_MODULE_NAME}
  47 -        PRIVATE ${PKG_CURL_LIBRARIES}
  48 +        PRIVATE CURL::libcurl
  49  )
  50
  51  #######################################################################################################