From e4c44f8b4674b88c0174270f27d61db808f66bc6 Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Tue, 2 Oct 2018 22:19:07 +0200
Subject: CMake: Allow to build with GraphicsMagick instead of ImageMagick

For now we still default to ImageMagick, but we can fall-back to
GraphicsMagick (e.g. if only ImageMagick 7 is available; add a check
for this).

To prefer GraphicsMagick despite a compatible version of ImageMagick
use -DWITH_IMAGE_MAGICK=OFF when running CMake
---
 src/extension/init.cpp                      | 8 ++++----
 src/extension/internal/image-resolution.cpp | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/extension/init.cpp b/src/extension/init.cpp
index 7524ba106..3ac73f05a 100644
--- a/src/extension/init.cpp
+++ b/src/extension/init.cpp
@@ -65,7 +65,7 @@
 #include "dbus/dbus-init.h"
 #endif
 
-#ifdef WITH_IMAGE_MAGICK
+#ifdef WITH_MAGICK
 #include <Magick++.h>
 #include "internal/bitmap/adaptiveThreshold.h"
 #include "internal/bitmap/addNoise.h"
@@ -102,7 +102,7 @@
 //#include "internal/bitmap/threshold.h"
 #include "internal/bitmap/unsharpmask.h"
 #include "internal/bitmap/wave.h"
-#endif /* WITH_IMAGE_MAGICK */
+#endif /* WITH_MAGICK */
 
 #include "internal/filter/filter.h"
 
@@ -191,7 +191,7 @@ init()
 #endif
 
     /* Raster Effects */
-#ifdef WITH_IMAGE_MAGICK
+#ifdef WITH_MAGICK
     Magick::InitializeMagick(NULL);
 
     Internal::Bitmap::AdaptiveThreshold::init();
@@ -229,7 +229,7 @@ init()
     //Internal::Bitmap::Threshold::init();
     Internal::Bitmap::Unsharpmask::init();
     Internal::Bitmap::Wave::init();
-#endif /* WITH_IMAGE_MAGICK */
+#endif /* WITH_MAGICK */
 
     Internal::Filter::Filter::filters_all();
 
diff --git a/src/extension/internal/image-resolution.cpp b/src/extension/internal/image-resolution.cpp
index befb48222..d1618d3b5 100644
--- a/src/extension/internal/image-resolution.cpp
+++ b/src/extension/internal/image-resolution.cpp
@@ -30,7 +30,7 @@
 #include <csetjmp>
 #endif
 
-#ifdef WITH_IMAGE_MAGICK
+#ifdef WITH_MAGICK
 #include <Magick++.h>
 #endif
 
@@ -396,7 +396,7 @@ void ImageResolution::readjfif(char const *) {
 
 #endif
 
-#ifdef WITH_IMAGE_MAGICK
+#ifdef WITH_MAGICK
 void ImageResolution::readmagick(char const *fn) {
     Magick::Image image;
     debug("Trying image.read");
@@ -439,7 +439,7 @@ void ImageResolution::readmagick(char const *fn) {
 void ImageResolution::readmagick(char const *) {
 }
 
-#endif /* WITH_IMAGE_MAGICK */
+#endif /* WITH_MAGICK */
 
 }
 }
-- 
cgit v1.2.3