diff options
| author | David Faure <faure@kde.org> | 2006-04-20 12:25:46 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2006-04-20 12:25:46 +0000 |
| commit | 9a75f145de53a04eca02dd5da5c2ab092f67d2f0 (patch) | |
| tree | 246e6e63b638374354d3496365be8b0064397a11 /modules/FindTIFF.cmake | |
| parent | 672022196187fa0d0b412c01f70de04b3827bbaf (diff) | |
| download | extra-cmake-modules-9a75f145de53a04eca02dd5da5c2ab092f67d2f0.tar.gz extra-cmake-modules-9a75f145de53a04eca02dd5da5c2ab092f67d2f0.tar.bz2 | |
OK so FIND_PATH and FIND_LIBRARIES use the cache already, so no need for the CACHED_FOO fast-path
when the check only uses those. Instead I used this, to avoid "Found libfoo" in the output when in
fact we didn't just look for it, we had it in the cache.
+if (TIFF_INCLUDE_DIR)
+ # Already in cache, be silent
+ set(TIFF_FIND_QUIETLY TRUE)
+endif (TIFF_INCLUDE_DIR)
CACHED_FOO remains for the cases where there is more logic to the configure check, like
PKGCONFIG, foo-config, or CHECK_LIBRARY_EXISTS (e.g. bzip2)
CCMAIL: kde-buildsystem@kde.org
svn path=/trunk/KDE/kdelibs/; revision=531839
Diffstat (limited to 'modules/FindTIFF.cmake')
| -rw-r--r-- | modules/FindTIFF.cmake | 66 |
1 files changed, 27 insertions, 39 deletions
diff --git a/modules/FindTIFF.cmake b/modules/FindTIFF.cmake index 18e051ba..7c6cfd91 100644 --- a/modules/FindTIFF.cmake +++ b/modules/FindTIFF.cmake @@ -7,47 +7,35 @@ # also defined, but NOT for general use are # TIFF_LIBRARY, where to find the TIFF library. -IF (DEFINED CACHED_TIFF) +if (TIFF_INCLUDE_DIR) + # Already in cache, be silent + set(TIFF_FIND_QUIETLY TRUE) +endif (TIFF_INCLUDE_DIR) - # in cache already - IF ("${CACHED_TIFF}" STREQUAL "YES") - SET(TIFF_FOUND TRUE) - ENDIF ("${CACHED_TIFF}" STREQUAL "YES") +FIND_PATH(TIFF_INCLUDE_DIR tiff.h + /usr/local/include + /usr/include +) -ELSE (DEFINED CACHED_TIFF) +set(TIFF_NAMES ${TIFF_NAMES} tiff libtiff) +FIND_LIBRARY(TIFF_LIBRARY + NAMES ${TIFF_NAMES} + PATHS /usr/lib /usr/local/lib +) - FIND_PATH(TIFF_INCLUDE_DIR tiff.h - /usr/local/include - /usr/include - ) - - set(TIFF_NAMES ${TIFF_NAMES} tiff libtiff) - FIND_LIBRARY(TIFF_LIBRARY - NAMES ${TIFF_NAMES} - PATHS /usr/lib /usr/local/lib - ) - - - if (TIFF_INCLUDE_DIR AND TIFF_LIBRARY) - set(TIFF_FOUND TRUE) - set(TIFF_LIBRARIES ${TIFF_LIBRARY} ) - set(CACHED_TIFF "YES") - else (TIFF_INCLUDE_DIR AND TIFF_LIBRARY) - set(CACHED_TIFF "NO") - endif (TIFF_INCLUDE_DIR AND TIFF_LIBRARY) - - - if (TIFF_FOUND) - if (NOT TIFF_FIND_QUIETLY) - message(STATUS "Found TIFF: ${TIFF_LIBRARY}") - endif (NOT TIFF_FIND_QUIETLY) - else (TIFF_FOUND) - if (TIFF_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find TIFF") - endif (TIFF_FIND_REQUIRED) - endif (TIFF_FOUND) +if (TIFF_INCLUDE_DIR AND TIFF_LIBRARY) + set(TIFF_FOUND TRUE) + set(TIFF_LIBRARIES ${TIFF_LIBRARY} ) +endif (TIFF_INCLUDE_DIR AND TIFF_LIBRARY) - set(CACHED_TIFF ${CACHED_TIFF} CACHE INTERNAL "If tiff was checked") - MARK_AS_ADVANCED(TIFF_INCLUDE_DIR TIFF_LIBRARY) +if (TIFF_FOUND) + if (NOT TIFF_FIND_QUIETLY) + message(STATUS "Found TIFF: ${TIFF_LIBRARY}") + endif (NOT TIFF_FIND_QUIETLY) +else (TIFF_FOUND) + if (TIFF_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find TIFF") + endif (TIFF_FIND_REQUIRED) +endif (TIFF_FOUND) -ENDIF (DEFINED CACHED_TIFF) +MARK_AS_ADVANCED(TIFF_INCLUDE_DIR TIFF_LIBRARY) |