From: Markus Koschany <apo@gambaru.de>
Date: Sun, 2 Nov 2014 12:44:14 +0000 (+0100)
Subject: fix imagemagick detection
X-Git-Tag: archive/raspbian/1.1+git20181118-4+rpi1~1^2^2^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=58b9f7919ab743d6780c4cf1162135548f144929;p=performous.git

fix imagemagick detection

Fix the detection of the ImageMagick library for Debian systems which use
Multiarch paths. That ensures that ss_extract and ss_cover_conv are built
again.

Forwarded: https://github.com/performous/performous/pull/113

Gbp-Pq: Name fix-imagemagick-detection.patch
---

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 50bdd6f..d96f1db 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -21,13 +21,18 @@ if (APPLE)
     find_package(ImageMagick COMPONENTS Magick++)
     include_directories(${ImageMagick_INCLUDE_DIRS})
 else (APPLE)
-    foreach(lib LibXML++ Z Magick++ Jpeg Tiff Png Freetype Z)
+    foreach(lib LibXML++ Z Jpeg Tiff Png Freetype Z)
 	    find_package(${lib})
     	if (${lib}_FOUND)
 	    	include_directories(${${lib}_INCLUDE_DIRS})
 		    add_definitions(${${lib}_DEFINITIONS})
     	endif (${lib}_FOUND)
     endforeach(lib)
+
+    find_package(ImageMagick COMPONENTS Magick++)
+    find_package(PkgConfig)
+    PKG_CHECK_MODULES(IMAGEMAGICK Magick++ MagickWand MagickCore)
+    include_directories(${ImageMagick_INCLUDE_DIRS})
 endif (APPLE)
 
 # Set default compile flags for GCC