From 371e2b8e20c2fe891f5fc83b90d0d1e097cb49b4 Mon Sep 17 00:00:00 2001 From: Brad Hards Date: Tue, 21 Aug 2007 16:21:34 +0000 Subject: Change the way we search to make sure that if we have more than one copy of OpenEXR (say 1.4 in /usr/lib and 1.6 in /usr/local/lib) that the paths given by pkg-config are actually used. svn path=/trunk/KDE/kdelibs/; revision=702948 --- modules/FindOpenEXR.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'modules') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index fafde519..bfdb471d 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -27,27 +27,31 @@ ENDIF (NOT WIN32) ${_OpenEXRIncDir} ${_OpenEXRIncDir}/OpenEXR/ ) - + FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half PATHS - ${_OPENEXRLinkDir} + ${_OpenEXRLinkDir} + NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex PATHS - ${_OPENEXRLinkDir} + ${_OpenEXRLinkDir} + NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath PATHS - ${_OPENEXRLinkDir} + ${_OpenEXRLinkDir} + NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf PATHS - ${_OPENEXRLinkDir} + ${_OpenEXRLinkDir} + NO_DEFAULT_PATH ) if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) -- cgit v1.2.1