Accepting request 180246 from home:tittiatcoke:branches:devel:tools:building

Patch to find the correct ImageMagick v6 include files

OBS-URL: https://build.opensuse.org/request/show/180246
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=113

cmake-fix-ImageMagick6.patch

@@ -0,0 +1,24 @@
+From: Funda Wang <fundawang@gmail.com>
+Date: Tue, 28 May 2013 06:17:49 +0000 (+0000)
+Subject: FindImageMagick: Find v6 include dir (#14174)
+X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a
+
+FindImageMagick: Find v6 include dir (#14174)
+
+The header files of ImageMagick are now located at
+<prefix>/include/ImageMagick-6 instead of <prefix>/include/ImageMagick.
+---
+
+diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
+index cd97b38..02a5777 100644
+--- a/Modules/FindImageMagick.cmake
++++ b/Modules/FindImageMagick.cmake
+@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header)
+       ${ImageMagick_INCLUDE_DIRS}
+       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
+     PATH_SUFFIXES
+-      ImageMagick
++      ImageMagick ImageMagick-6
+     DOC "Path to the ImageMagick include dir."
+     )
+   find_library(ImageMagick_${component}_LIBRARY

cmake.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Jun 20 19:17:35 UTC 2013 - tittiatcoke@gmail.com
+
+- Added upstream patch cmake-fix-ImageMagick6.patch
+
+   FindImageMagick: Find v6 include dir (#14174)
+
+   The header files of ImageMagick are now located at
+   <prefix>/include/ImageMagick-6 instead of 
+   <prefix>/include/ImageMagick.
+
 -------------------------------------------------------------------
 Sat Jun  8 08:16:43 UTC 2013 - cgiboudeaux@gmx.com
 

cmake.spec

@@ -23,6 +23,7 @@ Url:            http://www.cmake.org/
 Source0:        http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
 Patch1:         cmake-disable-builtin-chrpath.diff
 Patch2:         cmake-fix-ruby-test.patch
+Patch3:         cmake-fix-ImageMagick6.patch
 Summary:        Cross-platform, open-source make system
 License:        BSD-3-Clause
 Group:          Development/Tools/Building
@@ -51,6 +52,7 @@ CMake is a cross-platform, open-source make system
 %setup -q
 %patch1
 %patch2
+%patch3 -p1
 
 %build
 export CXXFLAGS="$RPM_OPT_FLAGS"