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

   1 diff --git a/CMakeLists.txt b/CMakeLists.txt
   2 index c708153..0e004da 100644
   3 --- a/CMakeLists.txt
   4 +++ b/CMakeLists.txt
   5 @@ -60,10 +60,11 @@ include(GNUInstallDirs)
   6  include(CTest)
   7  include(FindThreads)
   8
   9 +find_package(ZLIB REQUIRED)
  10 +if (0)
  11  # Use pkg-config to create a PkgConfig::Ptex_ZLIB imported target
  12  find_package(PkgConfig REQUIRED)
  13  pkg_checK_modules(Ptex_ZLIB REQUIRED zlib IMPORTED_TARGET)
  14 -
  15  enable_testing()
  16
  17  if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
  18 @@ -77,6 +78,7 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
  19          set(CMAKE_BUILD_TYPE "Release" CACHE STRING "type of build" FORCE)
  20      endif ()
  21  endif ()
  22 +endif()
  23
  24  if (NOT WIN32)
  25      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
  26 @@ -99,7 +101,9 @@ endif ()
  27  include_directories(src/ptex)
  28
  29  add_subdirectory(src/ptex)
  30 +if (0)
  31  add_subdirectory(src/utils)
  32  add_subdirectory(src/tests)
  33  add_subdirectory(src/doc)
  34 +endif()
  35  add_subdirectory(src/build)
  36 diff --git a/src/ptex/CMakeLists.txt b/src/ptex/CMakeLists.txt
  37 index ba3a3cc..1619ff1 100644
  38 --- a/src/ptex/CMakeLists.txt
  39 +++ b/src/ptex/CMakeLists.txt
  40 @@ -1,6 +1,8 @@
  41 -if (WIN32)
  42 -    add_definitions(/DPTEX_EXPORTS)
  43 -endif (WIN32)
  44 +if (BUILD_SHARED_LIBS)
  45 +    add_definitions(-DPTEX_EXPORTS)
  46 +else ()
  47 +    add_definitions(-DPTEX_STATIC)
  48 +endif ()
  49
  50  configure_file(PtexVersion.h.in
  51      ${CMAKE_CURRENT_SOURCE_DIR}/PtexVersion.h @ONLY)
  52 @@ -18,29 +20,35 @@ set(SRCS
  53      PtexWriter.cpp)
  54
  55  if(PTEX_BUILD_STATIC_LIBS)
  56 -    add_library(Ptex_static STATIC ${SRCS})
  57 -    set_target_properties(Ptex_static PROPERTIES OUTPUT_NAME Ptex)
  58 -    target_include_directories(Ptex_static
  59 +    add_library(Ptex STATIC ${SRCS})
  60 +    target_include_directories(Ptex
  61      PUBLIC
  62          $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
  63      PRIVATE
  64          ${CMAKE_CURRENT_SOURCE_DIR})
  65 -    target_link_libraries(Ptex_static
  66 -        PUBLIC ${CMAKE_THREAD_LIBS_INIT} PkgConfig::Ptex_ZLIB)
  67 -    install(TARGETS Ptex_static EXPORT Ptex DESTINATION ${CMAKE_INSTALL_LIBDIR})
  68 +    target_link_libraries(Ptex
  69 +        PUBLIC ${CMAKE_THREAD_LIBS_INIT} ZLIB::ZLIB)
  70 +    install(TARGETS Ptex EXPORT Ptex
  71 +            RUNTIME DESTINATION bin
  72 +            LIBRARY DESTINATION lib
  73 +            ARCHIVE DESTINATION lib
  74 +    )
  75  endif()
  76
  77  if(PTEX_BUILD_SHARED_LIBS)
  78 -    add_library(Ptex_dynamic SHARED ${SRCS})
  79 -    set_target_properties(Ptex_dynamic PROPERTIES OUTPUT_NAME Ptex)
  80 -    target_include_directories(Ptex_dynamic
  81 +    add_library(Ptex SHARED ${SRCS})
  82 +    target_include_directories(Ptex
  83          PUBLIC
  84              $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
  85          PRIVATE
  86              ${CMAKE_CURRENT_SOURCE_DIR})
  87 -    target_link_libraries(Ptex_dynamic
  88 -        PUBLIC ${CMAKE_THREAD_LIBS_INIT} PkgConfig::Ptex_ZLIB)
  89 -    install(TARGETS Ptex_dynamic EXPORT Ptex DESTINATION ${CMAKE_INSTALL_LIBDIR})
  90 +    target_link_libraries(Ptex
  91 +        PUBLIC ${CMAKE_THREAD_LIBS_INIT} ZLIB::ZLIB)
  92 +    install(TARGETS Ptex EXPORT Ptex
  93 +            RUNTIME DESTINATION bin
  94 +            LIBRARY DESTINATION lib
  95 +            ARCHIVE DESTINATION lib
  96 +    )
  97  endif()
  98
  99  install(FILES