Tree - rpms/cmake - CentOS Git server

mroche / rpms / cmake

Forked from rpms/cmake 3 years ago

Source
Stats

Blame SOURCES/cmake-2.8.12.2-IM_pkgconfig_hints.patch

Blob History Raw

		949600	`diff -Nrup a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake`
		949600	`--- a/Modules/FindImageMagick.cmake 2014-01-16 12:15:08.000000000 -0500`
		949600	`+++ b/Modules/FindImageMagick.cmake 2016-02-29 23:07:06.439208172 -0500`
		949600	`@@ -69,17 +69,24 @@`
		949600	`# (To distribute this file outside of CMake, substitute the full`
		949600	`# License text for the above reference.)`
		949600
		949600	`+find_package(PkgConfig QUIET)`
		949600	`+`
		949600	`#---------------------------------------------------------------------`
		949600	`# Helper functions`
		949600	`#---------------------------------------------------------------------`
		949600	`function(FIND_IMAGEMAGICK_API component header)`
		949600	`set(ImageMagick_${component}_FOUND FALSE PARENT_SCOPE)`
		949600
		949600	`+ pkg_check_modules(PC_${component} QUIET ${component})`
		949600	`+`
		949600	`find_path(ImageMagick_${component}_INCLUDE_DIR`
		949600	`NAMES ${header}`
		949600	`PATHS`
		949600	`${ImageMagick_INCLUDE_DIRS}`
		949600	`"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"`
		949600	`+ HINTS`
		949600	`+ ${PC_${component}_INCLUDEDIR}`
		949600	`+ ${PC_${component}_INCLUDE_DIRS}`
		949600	`PATH_SUFFIXES`
		949600	`ImageMagick ImageMagick-6`
		949600	`DOC "Path to the ImageMagick include dir."`
		949600	`@@ -88,6 +95,9 @@ function(FIND_IMAGEMAGICK_API component`
		949600	`NAMES ${ARGN}`
		949600	`PATHS`
		949600	`"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/lib"`
		949600	`+ HINTS`
		949600	`+ ${PC_${component}_LIBDIR}`
		949600	`+ ${PC_${component}_LIB_DIRS}`
		949600	`DOC "Path to the ImageMagick Magick++ library."`
		949600	`)`
		949600

mroche / rpms / cmake

Source Code

Blame SOURCES/cmake-2.8.12.2-IM_pkgconfig_hints.patch