diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-05-03 19:57:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-03 10:57:41 -0700 |
| commit | eefee7408133f3a0fef711ef9c6a3677b7e06fd7 (patch) | |
| tree | d21b1cad859472b9dd5783c9a26dbd8660b97a27 /ports/libheif/gdk-pixbuf.patch | |
| parent | 27f892aa14c0d5c141dac16b32e957890c732f67 (diff) | |
| download | vcpkg-eefee7408133f3a0fef711ef9c6a3677b7e06fd7.tar.gz vcpkg-eefee7408133f3a0fef711ef9c6a3677b7e06fd7.zip | |
[vcpkg baseline][libheif] fix CI errors if gdk-pixbuf can be found (#17593)
* fix libheif gdk-pixbuf error.
* version stuff
* add trace expand to get more info what happens in ci
* use pkg_get_variable instead of execute process
* fix patch
* update version stuff
* remove trace expand
* version again
Diffstat (limited to 'ports/libheif/gdk-pixbuf.patch')
| -rw-r--r-- | ports/libheif/gdk-pixbuf.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/ports/libheif/gdk-pixbuf.patch b/ports/libheif/gdk-pixbuf.patch new file mode 100644 index 000000000..ad2c1e5ae --- /dev/null +++ b/ports/libheif/gdk-pixbuf.patch @@ -0,0 +1,25 @@ +diff --git a/gdk-pixbuf/CMakeLists.txt b/gdk-pixbuf/CMakeLists.txt +index 85ad59708..d6aa4a5f9 100644 +--- a/gdk-pixbuf/CMakeLists.txt ++++ b/gdk-pixbuf/CMakeLists.txt +@@ -1,9 +1,9 @@ + if(UNIX) + find_package(PkgConfig) + find_package(Threads) +- pkg_check_modules(GDKPIXBUF2 gdk-pixbuf-2.0) ++ pkg_check_modules(GDKPIXBUF2 gdk-pixbuf-2.0 IMPORTED_TARGET) + + if(GDKPIXBUF2_FOUND) +- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} gdk-pixbuf-2.0 --variable gdk_pixbuf_moduledir --define-variable=prefix=${CMAKE_INSTALL_PREFIX} OUTPUT_VARIABLE GDKPIXBUF2_MODULE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) ++ pkg_get_variable(GDKPIXBUF2_MODULE_DIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir) + + add_library(pixbufloader-heif MODULE pixbufloader-heif.c) +@@ -13,7 +13,7 @@ if(UNIX) + ${GDKPIXBUF2_INCLUDE_DIRS} + ${libheif_BINARY_DIR} + ${libheif_SOURCE_DIR}) +- target_link_libraries(pixbufloader-heif PUBLIC ${GDKPIXBUF2_LIBRARIES} heif) ++ target_link_libraries(pixbufloader-heif PUBLIC PkgConfig::GDKPIXBUF2 heif) + + install(TARGETS pixbufloader-heif LIBRARY DESTINATION ${GDKPIXBUF2_MODULE_DIR}) + endif() |