ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/libpng/cmake.patch

   1 diff --git a/CMakeLists.txt b/CMakeLists.txt
   2 index 6451fcf..6599e1d 100644
   3 --- a/CMakeLists.txt
   4 +++ b/CMakeLists.txt
   5 @@ -44,7 +44,7 @@ if(NOT PNG_BUILD_ZLIB)
   6  endif()
   7
   8  if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
   9 -  find_library(M_LIBRARY m)
  10 +  set(M_LIBRARY m)
  11  else()
  12    # libm is not needed and/or not available
  13    set(M_LIBRARY "")
  14 @@ -551,21 +551,14 @@ endif()
  15
  16  if(PNG_STATIC)
  17    # does not work without changing name
  18 -  set(PNG_LIB_NAME_STATIC png_static)
  19    add_library(png_static STATIC ${libpng_sources})
  20    add_dependencies(png_static genfiles)
  21    # MSVC doesn't use a different file extension for shared vs. static
  22    # libs.  We are able to change OUTPUT_NAME to remove the _static
  23    # for all other platforms.
  24 -  if(NOT MSVC)
  25 -    set_target_properties(png_static PROPERTIES
  26 -      OUTPUT_NAME "${PNG_LIB_NAME}"
  27 -      CLEAN_DIRECT_OUTPUT 1)
  28 -  else()
  29 -    set_target_properties(png_static PROPERTIES
  30 -      OUTPUT_NAME "${PNG_LIB_NAME}_static"
  31 -      CLEAN_DIRECT_OUTPUT 1)
  32 -  endif()
  33 +  set_target_properties(png_static PROPERTIES
  34 +    OUTPUT_NAME "${PNG_LIB_NAME}"
  35 +    CLEAN_DIRECT_OUTPUT 1)
  36    list(APPEND PNG_LIB_TARGETS png_static)
  37    if(MSVC)
  38      # msvc does not append 'lib' - do it here to have consistent name
  39 @@ -915,7 +908,7 @@ endif()
  40
  41  # Create an export file that CMake users can include() to import our targets.
  42  if(NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL)
  43 -  install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake)
  44 +  install(EXPORT libpng DESTINATION lib/libpng FILE libpngConfig.cmake)
  45  endif()
  46
  47  # what's with libpng-manual.txt and all the extra files?