diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-03 00:10:02 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-03 00:10:02 +0000 |
| commit | d2df0412f728dd5bb54537dfdfe7c35b34d40e0e (patch) | |
| tree | e2703384779e83312c456399999997fcc289c5cf /CMakeScripts/DefineDependsandFlags.cmake | |
| parent | Merge branch 'master' into powerpencil (diff) | |
| parent | change assignment to equality (diff) | |
| download | inkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.tar.gz inkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.zip | |
Merge branch 'master' into powerpencil
Diffstat (limited to 'CMakeScripts/DefineDependsandFlags.cmake')
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 46fbe7568..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}) @@ -131,6 +121,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() |