ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/evpp/fix-linux-build.patch

   1 diff --git a/CMakeLists.txt b/CMakeLists.txt
   2 index 7872fc8..2a06614 100644
   3 --- a/CMakeLists.txt
   4 +++ b/CMakeLists.txt
   5 @@ -47,7 +47,11 @@ string (REPLACE ";" " " CMAKE_CXX_FLAGS "${CXX_FLAGS}")
   6  if (UNIX)
   7      SET(CMAKE_CXX_FLAGS_DEBUG   "-O0 -g -ggdb -D_DEBUG -DGOOGLE_STRIP_LOG=0")
   8      SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -ggdb -DNDEBUG -DGOOGLE_STRIP_LOG=1")
   9 -    SET(DEPENDENT_LIBRARIES event glog pthread)
  10 +    find_package(glog CONFIG REQUIRED)
  11 +    find_path(GLOG_INCLUDE_DIRS logging.h PATH_SUFFIXES glog)
  12 +    find_package(Libevent CONFIG REQUIRED)
  13 +    list(APPEND DEPENDENT_INCLUDE_DIRS "${GLOG_INCLUDE_DIRS}/../")
  14 +    SET(DEPENDENT_LIBRARIES libevent::core libevent::extra libevent::openssl glog::glog pthread)
  15  else (UNIX)
  16      SET(DEPENDENT_LIBRARIES event glog)
  17  endif (UNIX)
  18 diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
  19 index 469ed1c..8219424 100644
  20 --- a/apps/CMakeLists.txt
  21 +++ b/apps/CMakeLists.txt
  22 @@ -2,7 +2,7 @@
  23  include_directories(${PROJECT_SOURCE_DIR}/apps ${PROJECT_SOURCE_DIR}/3rdparty)
  24
  25  if (UNIX)
  26 -set(LIBRARIES evpp_concurrentqueue event glog pthread)
  27 +set(LIBRARIES evpp_concurrentqueue libevent::core libevent::extra libevent::openssl glog::glog pthread)
  28  link_directories("/home/s/safe/lib" ${PROJECT_BUILD_DIR}/lib)
  29  else(UNIX)
  30  set(LIBRARIES evpp_static event glog)
  31 diff --git a/benchmark/http/libevent/CMakeLists.txt b/benchmark/http/libevent/CMakeLists.txt
  32 index 1148616..0356b71 100644
  33 --- a/benchmark/http/libevent/CMakeLists.txt
  34 +++ b/benchmark/http/libevent/CMakeLists.txt
  35 @@ -1,3 +1,3 @@
  36
  37  add_executable(benchmark_http_libevent libevent_http_bench.c)
  38 -target_link_libraries(benchmark_http_libevent event)
  39 +target_link_libraries(benchmark_http_libevent libevent::core libevent::extra libevent::openssl)
  40 diff --git a/benchmark/ioevent/libevent/CMakeLists.txt b/benchmark/ioevent/libevent/CMakeLists.txt
  41 index dfa51a3..de4849d 100644
  42 --- a/benchmark/ioevent/libevent/CMakeLists.txt
  43 +++ b/benchmark/ioevent/libevent/CMakeLists.txt
  44 @@ -1,3 +1,3 @@
  45
  46  add_executable(benchmark_ioevent_libevent libevent_ioevent_bench.c)
  47 -target_link_libraries(benchmark_ioevent_libevent event)
  48 +target_link_libraries(benchmark_ioevent_libevent libevent::core libevent::extra libevent::openssl)
  49 diff --git a/benchmark/throughput/libevent/CMakeLists.txt b/benchmark/throughput/libevent/CMakeLists.txt
  50 index 21dab84..aefe698 100644
  51 --- a/benchmark/throughput/libevent/CMakeLists.txt
  52 +++ b/benchmark/throughput/libevent/CMakeLists.txt
  53 @@ -1,5 +1,5 @@
  54  add_executable(benchmark_tcp_libevent_client client.c)
  55 -target_link_libraries(benchmark_tcp_libevent_client event)
  56 +target_link_libraries(benchmark_tcp_libevent_client libevent::core libevent::extra libevent::openssl)
  57
  58  add_executable(benchmark_tcp_libevent_server server.c)
  59 -target_link_libraries(benchmark_tcp_libevent_server event)
  60 +target_link_libraries(benchmark_tcp_libevent_server libevent::core libevent::extra libevent::openssl)
  61 diff --git a/examples/recipes/self_control_timer/basic_01/CMakeLists.txt b/examples/recipes/self_control_timer/basic_01/CMakeLists.txt
  62 index 7834db4..82294c5 100644
  63 --- a/examples/recipes/self_control_timer/basic_01/CMakeLists.txt
  64 +++ b/examples/recipes/self_control_timer/basic_01/CMakeLists.txt
  65 @@ -1,7 +1,7 @@
  66  file(GLOB SRCS *.cc *.h)
  67
  68  add_executable(example_recipes_self_control_timer_basic_01 ${SRCS})
  69 -target_link_libraries(example_recipes_self_control_timer_basic_01 event)
  70 +target_link_libraries(example_recipes_self_control_timer_basic_01 libevent::core libevent::extra libevent::openssl)
  71
  72
  73
  74 diff --git a/examples/recipes/self_control_timer/basic_02/CMakeLists.txt b/examples/recipes/self_control_timer/basic_02/CMakeLists.txt
  75 index a8be419..0329ccc 100644
  76 --- a/examples/recipes/self_control_timer/basic_02/CMakeLists.txt
  77 +++ b/examples/recipes/self_control_timer/basic_02/CMakeLists.txt
  78 @@ -1,7 +1,7 @@
  79  file(GLOB SRCS *.cc *.h)
  80
  81  add_executable(example_recipes_self_control_timer_basic_02 ${SRCS})
  82 -target_link_libraries(example_recipes_self_control_timer_basic_02 event)
  83 +target_link_libraries(example_recipes_self_control_timer_basic_02 libevent::core libevent::extra libevent::openssl)
  84
  85
  86
  87 diff --git a/examples/recipes/self_control_timer/cancel_03/CMakeLists.txt b/examples/recipes/self_control_timer/cancel_03/CMakeLists.txt
  88 index 1cae9bb..218b771 100644
  89 --- a/examples/recipes/self_control_timer/cancel_03/CMakeLists.txt
  90 +++ b/examples/recipes/self_control_timer/cancel_03/CMakeLists.txt
  91 @@ -1,7 +1,7 @@
  92  file(GLOB SRCS *.cc *.h)
  93
  94  add_executable(example_recipes_self_control_timer_cancel_03 ${SRCS})
  95 -target_link_libraries(example_recipes_self_control_timer_cancel_03 event)
  96 +target_link_libraries(example_recipes_self_control_timer_cancel_03 libevent::core libevent::extra libevent::openssl)
  97
  98
  99
 100 diff --git a/examples/recipes/self_control_timer/periodic_04/CMakeLists.txt b/examples/recipes/self_control_timer/periodic_04/CMakeLists.txt
 101 index 749c584..e7c658e 100644
 102 --- a/examples/recipes/self_control_timer/periodic_04/CMakeLists.txt
 103 +++ b/examples/recipes/self_control_timer/periodic_04/CMakeLists.txt
 104 @@ -1,7 +1,7 @@
 105  file(GLOB SRCS *.cc *.h)
 106
 107  add_executable(example_recipes_self_control_timer_periodic_04 ${SRCS})
 108 -target_link_libraries(example_recipes_self_control_timer_periodic_04 event)
 109 +target_link_libraries(example_recipes_self_control_timer_periodic_04 libevent::core libevent::extra libevent::openssl)
 110
 111
 112