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/FindJasper.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/FindJasper.cmake')
| -rw-r--r-- | modules/FindJasper.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/modules/FindJasper.cmake b/modules/FindJasper.cmake index 9e876fec..9a6f2414 100644 --- a/modules/FindJasper.cmake +++ b/modules/FindJasper.cmake @@ -5,6 +5,13 @@ # JASPER_INCLUDE_DIR - the Jasper include directory # JASPER_LIBRARIES - The libraries needed to use Jasper +FIND_PACKAGE(JPEG) + +if (JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES) + # Already in cache, be silent + set(Jasper_FIND_QUIETLY TRUE) +endif (JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES) + FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h /usr/include /usr/local/include @@ -16,8 +23,6 @@ FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper /usr/local/lib ) -FIND_PACKAGE(JPEG) - if (JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES) set(JASPER_FOUND TRUE) set(JASPER_LIBRARIES ${JASPER_LIBRARY} ${JPEG_LIBRARIES} ) |