ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/cppfs/LibCrypto-fix.patch

   1 diff --git a/CMakeLists.txt b/CMakeLists.txt
   2 index ea9fd15..af63d1e 100644
   3 --- a/CMakeLists.txt
   4 +++ b/CMakeLists.txt
   5 @@ -7,7 +7,7 @@
   6  cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
   7
   8  # Include cmake modules
   9 -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
  10 +# list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
  11
  12  include(GenerateExportHeader)
  13
  14 diff --git a/source/cppfs/CMakeLists.txt b/source/cppfs/CMakeLists.txt
  15 index aa37eda..d29176a 100644
  16 --- a/source/cppfs/CMakeLists.txt
  17 +++ b/source/cppfs/CMakeLists.txt
  18 @@ -4,18 +4,18 @@
  19  #
  20
  21  find_package(LibSSH2)
  22 -find_package(LibCrypto)
  23 +# find_package(LibCrypto)
  24  find_package(ZLIB)
  25  find_package(OpenSSL)
  26
  27 -if (LibSSH2_FOUND AND LibCrypto_FOUND AND ZLIB_FOUND AND OpenSSL_FOUND)
  28 +if (LibSSH2_FOUND AND ZLIB_FOUND AND OpenSSL_FOUND)
  29      set(SSH_DEPS_MET TRUE)
  30  else()
  31      set(SSH_DEPS_MET FALSE)
  32  endif()
  33
  34  if (OPTION_BUILD_SSH_BACKEND AND NOT SSH_DEPS_MET)
  35 -    message(FATAL_ERROR "Requested to build ssh module but not all dependencies are found! LibSSH2: ${LibSSH2_FOUND}, LibCrypto: ${LibCrypto_FOUND}, ZLIB: ${ZLIB_FOUND}, OpenSSL: ${OpenSSL_FOUND}")
  36 +    message(FATAL_ERROR "Requested to build ssh module but not all dependencies are found! LibSSH2: ${LibSSH2_FOUND}, ZLIB: ${ZLIB_FOUND}, OpenSSL: ${OpenSSL_FOUND}")
  37  endif()
  38
  39
  40 @@ -207,10 +207,9 @@ target_link_libraries(${target}
  41  if (OPTION_BUILD_SSH_BACKEND)
  42      target_link_libraries(${target}
  43          PRIVATE
  44 -        ${OPENSSL_LIBRARIES}
  45 -        ${LIBSSH2_LIBRARY}
  46 -        ${LIBCRYPTO_LIBRARY}
  47 -        ${ZLIB_LIBRARY}
  48 +        Libssh2::libssh2
  49 +        OpenSSL::SSL OpenSSL::Crypto
  50 +        ZLIB::ZLIB
  51      )
  52
  53      if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows")