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

   1 diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
   2 index 5ebeb6afa..702864667 100644
   3 --- a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
   4 +++ b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
   5 @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.8)
   6
   7  project(io2d CXX)
   8
   9 -find_package(Cairo REQUIRED)
  10 -find_package(GraphicsMagick REQUIRED)
  11 +find_package(Cairo REQUIRED)
  12 +find_package(unofficial-GraphicsMagick REQUIRED)
  13
  14  add_library(io2d_cairo
  15         cairo_renderer-graphicsmagickinit.cpp
  16 @@ -24,7 +24,7 @@ target_include_directories(io2d_cairo PUBLIC
  17
  18  target_compile_features(io2d_cairo PUBLIC cxx_std_17)
  19
  20 -target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo GraphicsMagick::GraphicsMagick)
  21 +target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo unofficial::graphicsmagick::graphicsmagick)
  22
  23  install(
  24         TARGETS io2d_cairo EXPORT io2d_targets
  25 diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
  26 index abb150113..75d8c654d 100644
  27 --- a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
  28 +++ b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
  29 @@ -27,15 +27,24 @@ if(MSVC)
  30         target_compile_definitions(io2d_cairo_win32 PUBLIC -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS)
  31
  32         find_library(PIXMAN_LIB pixman-1)
  33 -       find_library(FREETYPE_LIB freetype)
  34 -       find_library(FONTCONFIG_LIB fontconfig)
  35 -       find_library(BZ_LIB bz2)
  36 -       find_library(JPEG_LIB jpeg)
  37 -       find_library(TIFF_LIB tiff)
  38 -       find_library(EXPAT_LIB expat)
  39 -       find_library(LZMA_LIB lzma)
  40 -       find_library(ICONV_LIB libiconv)
  41 -       find_library(CHARSET_LIB libcharset)
  42 +    find_package(FreeType REQUIRED)
  43 +       set(FREETYPE_LIB ${FREETYPE_LIBRARIES}) # I dont use targets here since this means I have to correct the config.cmake too
  44 +    find_package(Fontconfig REQUIRED)
  45 +       set(FONTCONFIG_LIB ${Fontconfig_LIBRARIES})
  46 +    find_package(BZip2 REQUIRED)
  47 +       set(BZ_LIB ${BZIP2_LIBRARIES})
  48 +    find_package(JPEG REQUIRED)
  49 +       set(JPEG_LIB ${JPEG_LIBRARIES})
  50 +    find_package(TIFF REQUIRED)
  51 +       set(TIFF_LIB ${TIFF_LIBRARIES})
  52 +    find_package(EXPAT REQUIRED)
  53 +       set(EXPAT_LIB ${EXPAT_LIBRARIES})
  54 +    find_package(LibLZMA REQUIRED)
  55 +       set(LZMA_LIB ${LIBLZMA_LIBRARIES})
  56 +    find_package(Iconv REQUIRED)
  57 +    if(NOT Iconv_IS_BUILT_IN)
  58 +        set(ICONV_LIB ${Iconv_LIBRARIES})
  59 +       endif()
  60
  61         target_link_libraries(io2d_cairo_win32 PUBLIC ${PIXMAN_LIB} ${FREETYPE_LIB} ${FONTCONFIG_LIB} ${BZ_LIB} ${JPEG_LIB} ${TIFF_LIB} ${EXPAT_LIB} ${LZMA_LIB} ${ICONV_LIB} ${CHARSET_LIB})
  62  endif()