diff options
| author | David Faure <faure@kde.org> | 2006-05-11 16:56:59 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2006-05-11 16:56:59 +0000 |
| commit | a1cd53cff402332c1bcf7a625b33d9330a247608 (patch) | |
| tree | c1e17c42054778348a4e176e6ec494b0a6068a01 /modules/FindOpenEXR.cmake | |
| parent | d46f0af3b68dba8e3bb5461c5b5e37862309875d (diff) | |
| download | extra-cmake-modules-a1cd53cff402332c1bcf7a625b33d9330a247608.tar.gz extra-cmake-modules-a1cd53cff402332c1bcf7a625b33d9330a247608.tar.bz2 | |
Remove my CACHED_ hacks which break when people install libxml2 after seeing the error
message about it - only use the cache when the check was previously successful, as discussed.
svn path=/trunk/KDE/kdelibs/; revision=539759
Diffstat (limited to 'modules/FindOpenEXR.cmake')
| -rw-r--r-- | modules/FindOpenEXR.cmake | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index a139a430..34620674 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -1,13 +1,16 @@ +# Try to find the OpenEXR libraries +# This check defines: +# +# OPENEXR_FOUND - system has OpenEXR +# OPENEXR_INCLUDE_DIR - OpenEXR include directory +# OPENEXR_LIBRARIES - Libraries needed to use OpenEXR -IF (DEFINED CACHED_OPENEXR) - +if (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) # in cache already - IF ("${CACHED_OPENEXR}" STREQUAL "YES") - SET(OPENEXR_FOUND TRUE) - ENDIF ("${CACHED_OPENEXR}" STREQUAL "YES") + SET(OPENEXR_FOUND TRUE) -ELSE (DEFINED CACHED_OPENEXR) +else (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls @@ -52,9 +55,7 @@ ELSE (DEFINED CACHED_OPENEXR) /usr/local/lib ) - set(OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ) - - if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) + if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) set(OPENEXR_FOUND TRUE) set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) @@ -62,12 +63,10 @@ ELSE (DEFINED CACHED_OPENEXR) if (OPENEXR_FOUND) - set(CACHED_OPENEXR "YES") if (NOT OpenEXR_FIND_QUIETLY) message(STATUS "Found OPENEXR: ${OPENEXR_LIBRARIES}") endif (NOT OpenEXR_FIND_QUIETLY) else (OPENEXR_FOUND) - set(CACHED_OPENEXR "NO") if (OpenEXR_FIND_REQUIRED) message(FATAL_ERROR "Could NOT find OPENEXR") endif (OpenEXR_FIND_REQUIRED) @@ -81,6 +80,4 @@ ELSE (DEFINED CACHED_OPENEXR) OPENEXR_IEX_LIBRARY OPENEXR_HALF_LIBRARY ) - set(CACHED_OPENEXR ${CACHED_OPENEXR} CACHE INTERNAL "If openexr was checked") - -ENDIF (DEFINED CACHED_OPENEXR) +endif (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) |