diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindOpenEXR.cmake | 56 | 
1 files changed, 27 insertions, 29 deletions
| diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 7b7a03f0..eb3829cb 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -14,53 +14,52 @@  if (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES)    # in cache already -  SET(OPENEXR_FOUND TRUE) +  set(OPENEXR_FOUND TRUE)  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    find_package(PkgConfig) -  pkg_check_modules(OPENEXR OpenEXR)  -  -ENDIF (NOT WIN32)   +  pkg_check_modules(PC_OPENEXR OpenEXR)  +    FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h -     ${OPENEXR_INCLUDE_DIRS} -     PATH_SUFFIXES /OpenEXR/ +     HINTS +     ${PC_OPENEXR_INCLUDEDIR} +     ${PC_OPENEXR_INCLUDE_DIRS} +     PATH_SUFFIXES OpenEXR    )    FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half -    PATHS -    ${OPENEXR_LIBRARY_DIRS} -    NO_DEFAULT_PATH +    HINTS +    ${PC_OPENEXR_LIBDIR} +    ${PC_OPENEXR_LIBRARY_DIRS}    ) -  FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half ) -   -   + +    FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex      PATHS -    ${OPENEXR_LIBRARY_DIRS} -    NO_DEFAULT_PATH +    ${PC_OPENEXR_LIBDIR} +    ${PC_OPENEXR_LIBRARY_DIRS}    ) -  FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex ) -   +    FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath -    PATHS -    ${OPENEXR_LIBRARY_DIRS} +    HINTS +    ${PC_OPENEXR_LIBDIR} +    ${PC_OPENEXR_LIBRARY_DIRS}      NO_DEFAULT_PATH    ) -  FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath )   -   +    FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf  -    PATHS -    ${OPENEXR_LIBRARY_DIRS} -    NO_DEFAULT_PATH +    HINTS +    ${PC_OPENEXR_LIBDIR} +    ${PC_OPENEXR_LIBRARY_DIRS}    ) -  FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf )      FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread -    PATHS -    ${OPENEXR_LIBRARY_DIRS} +    HINTS +    ${PC_OPENEXR_LIBDIR} +    ${PC_OPENEXR_LIBRARY_DIRS}    )    if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) @@ -82,7 +81,6 @@ ENDIF (NOT WIN32)    endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) -      if (OPENEXR_FOUND)      if (NOT OpenEXR_FIND_QUIETLY)        message(STATUS "Found OPENEXR: ${OPENEXR_LIBRARIES}") @@ -93,7 +91,7 @@ ENDIF (NOT WIN32)      endif (OpenEXR_FIND_REQUIRED)    endif (OPENEXR_FOUND) -  MARK_AS_ADVANCED( +  mark_as_advanced(       OPENEXR_INCLUDE_DIR        OPENEXR_LIBRARIES        OPENEXR_ILMIMF_LIBRARY  | 
