diff options
| author | Brad Hards <bradh@frogmouth.net> | 2007-08-21 16:21:34 +0000 |
|---|---|---|
| committer | Brad Hards <bradh@frogmouth.net> | 2007-08-21 16:21:34 +0000 |
| commit | 371e2b8e20c2fe891f5fc83b90d0d1e097cb49b4 (patch) | |
| tree | 0a2e2c5cebb766d22b8042b2e6c9bc4b446373ca | |
| parent | 6a9cb9ee8cb8f6d47dc06d9efb0a74be439210d0 (diff) | |
| download | extra-cmake-modules-371e2b8e20c2fe891f5fc83b90d0d1e097cb49b4.tar.gz extra-cmake-modules-371e2b8e20c2fe891f5fc83b90d0d1e097cb49b4.tar.bz2 | |
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
| -rw-r--r-- | modules/FindOpenEXR.cmake | 14 |
1 files changed, 9 insertions, 5 deletions
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) |