From 7414281e067da7260f800381af7b58844394bb1a Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Thu, 9 Aug 2007 19:36:35 +0000
Subject: Use FIND_PACKAGE_HANDLE_STANDARD_ARGS

svn path=/trunk/KDE/kdelibs/; revision=698299
---
 modules/FindAkode.cmake |  5 +----
 modules/FindTIFF.cmake  | 19 +++----------------
 2 files changed, 4 insertions(+), 20 deletions(-)

(limited to 'modules')

diff --git a/modules/FindAkode.cmake b/modules/FindAkode.cmake
index 156bf958..72061d37 100644
--- a/modules/FindAkode.cmake
+++ b/modules/FindAkode.cmake
@@ -18,10 +18,7 @@ IF (AKODE_LIBRARIES AND AKODE_INCLUDE_DIR)
 
 ELSE (AKODE_LIBRARIES AND AKODE_INCLUDE_DIR)
 
-  FIND_PROGRAM(AKODECONFIG_EXECUTABLE NAMES akode-config PATHS
-     /usr/bin
-     /usr/local/bin
-  )
+  FIND_PROGRAM(AKODECONFIG_EXECUTABLE NAMES akode-config) 
 
   # if akode-config has been found
   IF (AKODECONFIG_EXECUTABLE)
diff --git a/modules/FindTIFF.cmake b/modules/FindTIFF.cmake
index 81931e8a..8c8f921a 100644
--- a/modules/FindTIFF.cmake
+++ b/modules/FindTIFF.cmake
@@ -20,21 +20,8 @@ find_path(TIFF_INCLUDE_DIR NAMES tiff.h )
 set(TIFF_NAMES ${TIFF_NAMES} tiff libtiff)
 find_library(TIFF_LIBRARY NAMES ${TIFF_NAMES} )
 
-if (TIFF_INCLUDE_DIR AND TIFF_LIBRARY)
-   set(TIFF_FOUND TRUE)
-   set(TIFF_LIBRARIES ${TIFF_LIBRARY} )
-else (TIFF_INCLUDE_DIR AND TIFF_LIBRARY)
-   set(TIFF_FOUND FALSE)
-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)
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TIFF DEFAULT_MSG TIFF_INCLUDE_DIR TIFF_LIBRARY)
 
+set(TIFF_LIBRARIES ${TIFF_LIBRARY} )
 mark_as_advanced(TIFF_INCLUDE_DIR TIFF_LIBRARY)
-- 
cgit v1.2.1