From 9a75f145de53a04eca02dd5da5c2ab092f67d2f0 Mon Sep 17 00:00:00 2001 From: David Faure Date: Thu, 20 Apr 2006 12:25:46 +0000 Subject: 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 --- modules/FindJasper.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'modules/FindJasper.cmake') 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} ) -- cgit v1.2.1