From be1d35524245b739a4e282709325f6fd7e26cdfd Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Sat, 9 Sep 2017 13:10:06 +0200 Subject: [PATCH] Allow linking against GraphisMagick as an alternative to ImageMagick This is the same approach used by GNU Octave. In contrast to Octave, we still default to ImageMagick. Fixes bug #375202 --- CMakeLists.txt | 2 +- CMakeScripts/DefineDependsandFlags.cmake | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b643b2b60..cb436d95b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,7 +99,7 @@ option(WITH_PROFILING "Turn on profiling" OFF) # Set to true if compiler/linker option(ENABLE_POPPLER "Compile with support of libpoppler" ON) option(ENABLE_POPPLER_CAIRO "Compile with support of libpoppler-cairo for rendering PDF preview (depends on ENABLE_POPPLER)" ON) -option(WITH_IMAGE_MAGICK "Compile with support of ImageMagick for raster extensions and image import resolution" ON) +option(WITH_IMAGE_MAGICK "Compile with support of ImageMagick for raster extensions and image import resolution" "ImageMagick") option(WITH_LIBCDR "Compile with support of libcdr for CorelDRAW Diagrams" ON) option(WITH_LIBVISIO "Compile with support of libvisio for Microsoft Visio Diagrams" ON) option(WITH_LIBWPG "Compile with support of libwpg for WordPerfect Graphics" ON) diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 48979c67e5..470913fc48 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -384,7 +384,7 @@ list(APPEND INKSCAPE_INCS_SYS ${ZLIB_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES}) if(WITH_IMAGE_MAGICK) - pkg_check_modules(ImageMagick ImageMagick++ ) + pkg_check_modules(${WITH_IMAGE_MAGICK} ${WITH_IMAGE_MAGICK}++ ) if(ImageMagick_FOUND) list(APPEND INKSCAPE_LIBS ${ImageMagick_LDFLAGS}) @@ -392,6 +392,12 @@ if(WITH_IMAGE_MAGICK) list(APPEND INKSCAPE_INCS_SYS ${ImageMagick_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${ImageMagick_LIBRARIES}) + elseif(GraphicsMagick_FOUND) + list(APPEND INKSCAPE_LIBS ${GraphicsMagick_LDFLAGS}) + add_definitions(${GraphicsMagick_CFLAGS_OTHER}) + + list(APPEND INKSCAPE_INCS_SYS ${GraphicsMagick_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${GraphicsMagick_LIBRARIES}) else() set(WITH_IMAGE_MAGICK OFF) # enable 'Extensions > Raster' endif() -- 2.14.1