[cmake] respin cmake-2.8.11-rc1-IM_pkgconfig_hints.patch
Rex Dieter
rdieter at fedoraproject.org
Mon Mar 18 14:20:17 UTC 2013
commit 2b84e7061713c47c9c245946d3ccade28eba0548
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Mar 18 09:19:56 2013 -0500
respin cmake-2.8.11-rc1-IM_pkgconfig_hints.patch
cmake-2.8.11-rc1-IM_pkgconfig_hints.patch | 18 +++++++++++++-----
cmake.spec | 5 ++++-
2 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/cmake-2.8.11-rc1-IM_pkgconfig_hints.patch b/cmake-2.8.11-rc1-IM_pkgconfig_hints.patch
index 9d1f947..6810ecc 100644
--- a/cmake-2.8.11-rc1-IM_pkgconfig_hints.patch
+++ b/cmake-2.8.11-rc1-IM_pkgconfig_hints.patch
@@ -1,7 +1,15 @@
diff -up cmake-2.8.11-rc1/Modules/FindImageMagick.cmake.IM_pkgconfig_hints cmake-2.8.11-rc1/Modules/FindImageMagick.cmake
---- cmake-2.8.11-rc1/Modules/FindImageMagick.cmake.IM_pkgconfig_hints 2013-03-16 20:17:26.927416851 -0500
-+++ cmake-2.8.11-rc1/Modules/FindImageMagick.cmake 2013-03-16 20:22:10.797867982 -0500
-@@ -77,11 +77,16 @@ find_package(PkgConfig)
+--- cmake-2.8.11-rc1/Modules/FindImageMagick.cmake.IM_pkgconfig_hints 2013-03-14 13:10:40.000000000 -0500
++++ cmake-2.8.11-rc1/Modules/FindImageMagick.cmake 2013-03-18 09:18:09.453420248 -0500
+@@ -69,17 +69,24 @@
+ # (To distribute this file outside of CMake, substitute the full
+ # License text for the above reference.)
+
++find_package(PkgConfig QUIET)
++
+ #---------------------------------------------------------------------
+ # Helper functions
+ #---------------------------------------------------------------------
function(FIND_IMAGEMAGICK_API component header)
set(ImageMagick_${component}_FOUND FALSE PARENT_SCOPE)
@@ -18,7 +26,7 @@ diff -up cmake-2.8.11-rc1/Modules/FindImageMagick.cmake.IM_pkgconfig_hints cmake
PATH_SUFFIXES
ImageMagick
DOC "Path to the ImageMagick include dir."
-@@ -90,6 +95,9 @@ function(FIND_IMAGEMAGICK_API component
+@@ -88,6 +95,9 @@ function(FIND_IMAGEMAGICK_API component
NAMES ${ARGN}
PATHS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/lib"
@@ -28,7 +36,7 @@ diff -up cmake-2.8.11-rc1/Modules/FindImageMagick.cmake.IM_pkgconfig_hints cmake
DOC "Path to the ImageMagick Magick++ library."
)
-@@ -149,17 +157,17 @@ foreach(component ${ImageMagick_FIND_COM
+@@ -147,17 +157,17 @@ foreach(component ${ImageMagick_FIND_COM
)
if(component STREQUAL "Magick++")
FIND_IMAGEMAGICK_API(Magick++ Magick++.h
diff --git a/cmake.spec b/cmake.spec
index 1353c39..2d8c6c4 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -13,7 +13,7 @@
Name: cmake
Version: 2.8.11
-Release: 0.3.rc1%{?dist}
+Release: 0.4.rc1%{?dist}
Summary: Cross-platform make system
Group: Development/Tools
@@ -190,6 +190,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
+* Mon Mar 18 2013 Rex Dieter <rdieter at fedoraproject.org> 2.8.11-0.4.rc1
+- respin cmake-2.8.11-rc1-IM_pkgconfig_hints.patch
+
* Sat Mar 16 2013 Rex Dieter <rdieter at fedoraproject.org> 2.8.11-0.3.rc1
- Patch FindImageMagick.cmake for newer ImageMagick versions
More information about the scm-commits
mailing list