rpms/cmake
7
0
Fork 0
Code Issues Pull Requests Releases Activity

respin cmake-2.8.11-rc1-IM_pkgconfig_hints.patch

Browse Source
This commit is contained in:
Rex Dieter 2013-03-18 09:19:56 -05:00
parent b28dbeddc3
commit 2b84e70617
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmake-2.8.11-rc1-IM_pkgconfig_hints.patch
View File

@ -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 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.IM_pkgconfig_hints 2013-03-14 13:10:40.000000000 -0500
+++ cmake-2.8.11-rc1/Modules/FindImageMagick.cmake 2013-03-16 20:22:10.797867982 -0500 +++ cmake-2.8.11-rc1/Modules/FindImageMagick.cmake 2013-03-18 09:18:09.453420248 -0500
@@ -77,11 +77,16 @@ find_package(PkgConfig) @@ -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) function(FIND_IMAGEMAGICK_API component header)
set(ImageMagick_${component}_FOUND FALSE PARENT_SCOPE) 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 PATH_SUFFIXES
ImageMagick ImageMagick
DOC "Path to the ImageMagick include dir." 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} NAMES ${ARGN}
PATHS PATHS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/lib" "[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." 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++") if(component STREQUAL "Magick++")
FIND_IMAGEMAGICK_API(Magick++ Magick++.h FIND_IMAGEMAGICK_API(Magick++ Magick++.h

5
cmake.spec
View File

@ -13,7 +13,7 @@
Name: cmake Name: cmake
Version: 2.8.11 Version: 2.8.11
Release: 0.3.rc1%{?dist} Release: 0.4.rc1%{?dist}
Summary: Cross-platform make system Summary: Cross-platform make system
Group: Development/Tools Group: Development/Tools
@ -190,6 +190,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Mon Mar 18 2013 Rex Dieter <rdieter@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@fedoraproject.org> 2.8.11-0.3.rc1 * Sat Mar 16 2013 Rex Dieter <rdieter@fedoraproject.org> 2.8.11-0.3.rc1
- Patch FindImageMagick.cmake for newer ImageMagick versions - Patch FindImageMagick.cmake for newer ImageMagick versions