ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/ppconsul/cmake_build.patch

   1 diff --git a/CMakeLists.txt b/CMakeLists.txt
   2 index 92e4698..aa643aa 100644
   3 --- a/CMakeLists.txt
   4 +++ b/CMakeLists.txt
   5 @@ -52,6 +52,8 @@ endif()
   6
   7  enable_testing()
   8
   9 +find_package(json11 REQUIRED)
  10 +
  11  if (${USE_CPPNETLIB})
  12      find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS thread filesystem system date_time chrono regex)
  13
  14 @@ -75,6 +77,8 @@ else ()
  15            set (CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${CURL_ROOT}/lib")
  16      endif ()
  17      find_package(CURL REQUIRED)
  18 +    find_package(OpenSSL REQUIRED)
  19 +    find_package(ZLIB REQUIRED)
  20  endif ()
  21
  22  set(LIBB64_DIR "${PROJECT_SOURCE_DIR}/ext/b64")
  23 @@ -87,9 +91,7 @@ if (WIN32 AND NOT BUILD_STATIC_LIB)
  24      message(FATAL_ERROR "Building Ppconsul as dynamic library on Windows is not supported, see https://github.com/oliora/ppconsul/issues/25")
  25  endif()
  26
  27 -add_subdirectory(ext/json11)
  28  add_subdirectory(src)
  29 -add_subdirectory(tests)
  30
  31  install(
  32      DIRECTORY "${HEADERS_DIR}"
  33 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
  34 index d747100..966c7e2 100644
  35 --- a/src/CMakeLists.txt
  36 +++ b/src/CMakeLists.txt
  37 @@ -78,7 +78,7 @@ target_include_directories(${PROJECT_NAME}
  38
  39  target_link_libraries(${PROJECT_NAME}
  40      PRIVATE
  41 -        json11
  42 +        ${JSON11_LIBRARIES}
  43          ${Boost_LIBRARIES}
  44  )
  45
  46 @@ -87,7 +87,10 @@ if (${USE_CPPNETLIB})
  47      target_link_libraries(${PROJECT_NAME} PRIVATE ${CPPNETLIB_LIBRARIES})
  48  else ()
  49      target_include_directories(${PROJECT_NAME} PRIVATE ${CURL_INCLUDE_DIR})
  50 -    target_link_libraries(${PROJECT_NAME} PRIVATE ${CURL_LIBRARIES})
  51 +    target_link_libraries(${PROJECT_NAME} PRIVATE ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} ZLIB::ZLIB)
  52 +    if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  53 +        target_link_libraries(${PROJECT_NAME} PRIVATE "-framework CoreFoundation" "-framework Security")
  54 +    endif ()
  55  endif ()
  56
  57  source_group(${PROJECT_NAME} FILES ${SOURCES})
  58 diff --git a/src/s11n.h b/src/s11n.h
  59 index c317834..3cb03c4 100644
  60 --- a/src/s11n.h
  61 +++ b/src/s11n.h
  62 @@ -6,7 +6,7 @@
  63
  64  #include "ppconsul/config.h"
  65  #include "ppconsul/error.h"
  66 -#include <json11/json11.hpp>
  67 +#include <json11.hpp>
  68  #include <vector>
  69  #include <chrono>
  70  #include <set>