[gdk-pixbuf] GdkPixbuf fix for building on macOS (#11721)

* fix for building on macOS

* increase control port version

Co-authored-by: Angel Sánchez <angelsanchez@inedit.com>
This commit is contained in:
angelmixu 2020-06-03 07:34:47 +02:00 committed by GitHub
parent a41c53c147
commit 01b10260c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions

View File

@ -12,9 +12,10 @@ find_package(PNG REQUIRED)
find_package(unofficial-glib CONFIG REQUIRED)
find_path(GLIB_INCLUDE_DIR glib.h)
find_package(unofficial-gettext CONFIG REQUIRED)
find_path(LIBINTL_INCLUDE_DIR libintl.h)
if(WIN32)
find_package(unofficial-gettext CONFIG REQUIRED)
find_path(LIBINTL_INCLUDE_DIR libintl.h)
configure_file(${CMAKE_SOURCE_DIR}/config.h.win32 ${CMAKE_SOURCE_DIR}/config.h COPYONLY)
else()
configure_file(${CMAKE_SOURCE_DIR}/config.h.linux ${CMAKE_SOURCE_DIR}/config.h COPYONLY)
@ -68,12 +69,12 @@ target_include_directories(gdk-pixbuf PRIVATE
${LIBINTL_INCLUDE_DIR})
set(LIBS
unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject
unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject unofficial::gettext::libintl
${ZLIB_LIBRARIES}
${PNG_LIBRARIES}
)
if(WIN32)
list(APPEND LIBS Gdiplus ole32 unofficial::gettext::libintl)
list(APPEND LIBS Gdiplus ole32)
else()
list(APPEND LIBS m)
endif()

View File

@ -1,5 +1,5 @@
Source: gdk-pixbuf
Version: 2.36.9-4
Version: 2.36.9-5
Homepage: https://developer.gnome.org/gdk-pixbuf/
Description: Image loading library.
Build-Depends: gettext, zlib, libpng, glib