From 58b9f7919ab743d6780c4cf1162135548f144929 Mon Sep 17 00:00:00 2001 From: Markus Koschany Date: Sun, 2 Nov 2014 13:44:14 +0100 Subject: [PATCH] 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 --- tools/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 -- 2.30.2