diff options
Diffstat (limited to 'modules/FindOpenEXR.cmake')
| -rw-r--r-- | modules/FindOpenEXR.cmake | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 35b7e001..7b7a03f0 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -20,18 +20,18 @@ else (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) - - PKGCONFIG(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflags) + find_package(PkgConfig) + pkg_check_modules(OPENEXR OpenEXR) + ENDIF (NOT WIN32) FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h - ${_OpenEXRIncDir} + ${OPENEXR_INCLUDE_DIRS} PATH_SUFFIXES /OpenEXR/ ) FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half PATHS - ${_OpenEXRLinkDir} + ${OPENEXR_LIBRARY_DIRS} NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half ) @@ -39,30 +39,28 @@ ENDIF (NOT WIN32) FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex PATHS - ${_OpenEXRLinkDir} + ${OPENEXR_LIBRARY_DIRS} NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex ) FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath PATHS - ${_OpenEXRLinkDir} + ${OPENEXR_LIBRARY_DIRS} NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath ) FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf PATHS - ${_OpenEXRLinkDir} + ${OPENEXR_LIBRARY_DIRS} NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf ) FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread PATHS - ${_OPENEXRLinkDir} - /usr/lib - /usr/local/lib + ${OPENEXR_LIBRARY_DIRS} ) if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) |