From 9418824967eb4c53371ef8588243fed4cab496e0 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 6 Sep 2017 15:05:31 +0200 Subject: adapt to poppler 0.58 --- CMakeScripts/DefineDependsandFlags.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'CMakeScripts/DefineDependsandFlags.cmake') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 46fbe7568..48979c67e 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -131,6 +131,10 @@ if(ENABLE_POPPLER) POPPLER_VERSION VERSION_EQUAL "0.29.0") set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON) endif() + if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR + POPPLER_VERSION VERSION_EQUAL "0.58.0") + set(POPPLER_NEW_OBJECT_API ON) + endif() else() set(ENABLE_POPPLER_CAIRO OFF) endif() -- cgit v1.2.3 From 5433ac0513099a4a12caba0cda8a2a9d30e13a22 Mon Sep 17 00:00:00 2001 From: Stefano Facchini Date: Fri, 13 Oct 2017 19:03:28 +0200 Subject: Remove deprecated GNOME VFS Just use Gio::File when access to non-local files is needed. --- CMakeScripts/DefineDependsandFlags.cmake | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'CMakeScripts/DefineDependsandFlags.cmake') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 48979c67e..b1ffbc9c8 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -59,16 +59,6 @@ if(APPLE AND DEFINED ENV{CMAKE_PREFIX_PATH}) endif() -if(WITH_GNOME_VFS) - find_package(GnomeVFS2) - if(GNOMEVFS2_FOUND) - list(APPEND INKSCAPE_INCS_SYS ${GNOMEVFS2_INCLUDE_DIR}) - list(APPEND INKSCAPE_LIBS ${GNOMEVFS-2_LIBRARY}) - else() - set(WITH_GNOME_VFS OFF) - endif() -endif() - find_package(JeMalloc) if (JEMALLOC_FOUND) list(APPEND INKSCAPE_LIBS ${JEMALLOC_LIBRARIES}) -- cgit v1.2.3