[Pkg-cmake-commits] [cmake] 05/08: Fix detection of ImageMagick.

[Felix Geyer]

This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch experimental
in repository cmake.

commit 264cae938928b702d77b4932ea1dd099024f92f8
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Jul 10 10:47:05 2016 +0200

    Fix detection of ImageMagick.
---
 debian/changelog                                  |  2 ++
 debian/patches/FindImageMagick_find_program.patch | 32 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7a1586a..1fab0f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ cmake (3.6.0-1) UNRELEASED; urgency=medium
   * Drop patches that have been applied upstream:
     - FindLibArchive_Support_libarchive_3.2.patch
     - file_Sort_GLOB_results_to_make_it_deterministic.patch
+  * Fix detection of ImageMagick.
+    - Add FindImageMagick_find_program.patch
 
  -- Felix Geyer <fgeyer at debian.org>  Sat, 09 Jul 2016 11:23:12 +0200
 
diff --git a/debian/patches/FindImageMagick_find_program.patch b/debian/patches/FindImageMagick_find_program.patch
new file mode 100644
index 0000000..09a1b3c
--- /dev/null
+++ b/debian/patches/FindImageMagick_find_program.patch
@@ -0,0 +1,32 @@
+Description: FindImageMagick: Use find_program instead of find_path
+ Since cmake 3.6 find_path doesn't use the system search paths anymore.
+ As a result FindImageMagick wasn't able to get the executable dir.
+Author: Felix Geyer <fgeyer at debian.org>
+Forwarded: https://gitlab.kitware.com/cmake/cmake/merge_requests/30
+
+--- a/Modules/FindImageMagick.cmake
++++ b/Modules/FindImageMagick.cmake
+@@ -185,17 +185,21 @@ endfunction()
+ # Start Actual Work
+ #---------------------------------------------------------------------
+ # Try to find a ImageMagick installation binary path.
+-find_path(ImageMagick_EXECUTABLE_DIR
++find_program(ImageMagick_EXECUTABLE_FILENAME
+   NAMES mogrify${CMAKE_EXECUTABLE_SUFFIX}
+   PATHS
+     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]"
+   DOC "Path to the ImageMagick binary directory."
+   NO_DEFAULT_PATH
+   )
+-find_path(ImageMagick_EXECUTABLE_DIR
++find_program(ImageMagick_EXECUTABLE_FILENAME
+   NAMES mogrify${CMAKE_EXECUTABLE_SUFFIX}
+   )
+ 
++if(ImageMagick_EXECUTABLE_FILENAME)
++  get_filename_component(ImageMagick_EXECUTABLE_DIR "${ImageMagick_EXECUTABLE_FILENAME}" DIRECTORY)
++endif()
++
+ # Find each component. Search for all tools in same dir
+ # <ImageMagick_EXECUTABLE_DIR>; otherwise they should be found
+ # independently and not in a cohesive module such as this one.
diff --git a/debian/patches/series b/debian/patches/series
index e9e2070..f58b484 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 FindBoost_add_-lpthread_#563479.diff
 qt_import_dir_variable.diff
 fix-ftbfs-on-kfreebsd.patch
+FindImageMagick_find_program.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cmake/cmake.git