Use FIND_PACKAGE_HANDLE_STANDARD_ARGS

Fix typo

svn path=/trunk/KDE/kdelibs/; revision=702150

9 files changed, 16 insertions, 75 deletions

diff --git a/modules/FindBerkeleyDB.cmake b/modules/FindBerkeleyDB.cmake
index e68af609..07a39a17 100644
--- a/modules/FindBerkeleyDB.cmake
+++ b/modules/FindBerkeleyDB.cmake
@@ -18,20 +18,8 @@ FIND_PATH(BERKELEY_DB_INCLUDE_DIR db.h
 
 FIND_LIBRARY(BERKELEY_DB_LIBRARIES NAMES db )
 
-IF(BERKELEY_DB_INCLUDE_DIR AND BERKELEY_DB_LIBRARIES)
-   SET(BERKELEY_DB_FOUND TRUE)
-ENDIF(BERKELEY_DB_INCLUDE_DIR AND BERKELEY_DB_LIBRARIES)
-
-IF(BERKELEY_DB_FOUND)
-  IF(NOT Berkeley_DB_FIND_QUIETLY)
-    MESSAGE(STATUS "Found Berkeley DB: ${BERKELEY_DB_LIBRARIES}")
-  ENDIF(NOT Berkeley_DB_FIND_QUIETLY)
-ELSE(BERKELEY_DB_FOUND)
-  IF(Berkeley_DB_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could not find Berkeley DB >= 4.1")
-  ENDIF(Berkeley_DB_FIND_REQUIRED)
-ENDIF(BERKELEY_DB_FOUND)
-
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Berkeley "Could not find Berkeley DB >= 4.1" BERKELEY_DB_INCLUDE_DIR BERKELEY_DB_LIBRARIES
 # show the BERKELEY_DB_INCLUDE_DIR and BERKELEY_DB_LIBRARIES variables only in the advanced view
 MARK_AS_ADVANCED(BERKELEY_DB_INCLUDE_DIR BERKELEY_DB_LIBRARIES )
 
diff --git a/modules/FindENCHANT.cmake b/modules/FindENCHANT.cmake
index 591230f7..82455c1f 100644
--- a/modules/FindENCHANT.cmake
+++ b/modules/FindENCHANT.cmake
@@ -36,20 +36,9 @@ else (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
   find_library(ENCHANT_LIBRARIES NAMES enchant
                PATHS    ${_ENCHANTLinkDir} )
 
-  if (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
-     set(ENCHANT_FOUND TRUE)
-  endif (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
-  
-  if (ENCHANT_FOUND)
-    if (NOT ENCHANT_FIND_QUIETLY)
-      message(STATUS "Found ENCHANT: ${ENCHANT_LIBRARIES}")
-    endif (NOT ENCHANT_FIND_QUIETLY)
-  else (ENCHANT_FOUND)
-    if (ENCHANT_FIND_REQUIRED)
-      message(FATAL_ERROR "Could NOT find ENCHANT")
-    endif (ENCHANT_FIND_REQUIRED)
-  endif (ENCHANT_FOUND)
-  
+  include(FindPackageHandleStandardArgs)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(ENCHANT DEFAULT_MSG ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES )
+
   mark_as_advanced(ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES)
   
 endif (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
diff --git a/modules/FindFontconfig.cmake b/modules/FindFontconfig.cmake
index 791d05ea..10408b12 100644
--- a/modules/FindFontconfig.cmake
+++ b/modules/FindFontconfig.cmake
@@ -5,7 +5,7 @@
 #  FONTCONFIG_LIBRARIES - Link these to use FONTCONFIG
 #  FONTCONFIG_DEFINITIONS - Compiler switches required for using FONTCONFIG
 
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
+# Copyright (c) 2006,2007 Laurent Montel, <montel@kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@ -39,20 +39,9 @@ else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
     ${_FONTCONFIGLinkDir}
   )
 
-  if (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
-     set(FONTCONFIG_FOUND TRUE)
-  endif (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
-
-  if (FONTCONFIG_FOUND)
-    if (NOT Fontconfig_FIND_QUIETLY)
-      message(STATUS "Found FONTCONFIG: ${FONTCONFIG_LIBRARIES}")
-    endif (NOT Fontconfig_FIND_QUIETLY)
-  else (FONTCONFIG_FOUND)
-    if (Fontconfig_FIND_REQUIRED)
-      message(FATAL_ERROR "Could NOT find FONTCONFIG")
-    endif (Fontconfig_FIND_REQUIRED)
-  endif (FONTCONFIG_FOUND)
-
-  mark_as_advanced(FONTCONFIG_LIBRARIES)
+  include(FindPackageHandleStandardArgs)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fontconfig DEFAULT_MSG FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR )
+  
+  mark_as_advanced(FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR)
 
 endif (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake
index 6029d9e5..5ccdc881 100644
--- a/modules/FindKDE4Internal.cmake
+++ b/modules/FindKDE4Internal.cmake
@@ -198,9 +198,6 @@
 # KDE4_INSTALL_HANDBOOK()
 #   Install the handbook documentation
 #
-# KDE4_CREATE_HTML_HANDBOOK( docbookfile )
-#   Create HTML version of the handbook from the docbookfile (using meinproc)
-#
 # _KDE4_PLATFORM_INCLUDE_DIRS is used only internally
 # _KDE4_PLATFORM_DEFINITIONS is used only internally
 #
diff --git a/modules/FindKNepomuk.cmake b/modules/FindKNepomuk.cmake
index ba483a8e..dbbadfeb 100644
--- a/modules/FindKNepomuk.cmake
+++ b/modules/FindKNepomuk.cmake
@@ -25,19 +25,9 @@ FIND_LIBRARY(KNEPOMUK_LIBRARIES
   ${LIB_INSTALL_DIR}
 )
 
-if(KNEPOMUK_INCLUDES AND KNEPOMUK_LIBRARIES)
-   set(KNEPOMUK_FOUND TRUE)
-endif(KNEPOMUK_INCLUDES AND KNEPOMUK_LIBRARIES)
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KNepomuk DEFAULT_MSG KNEPOMUK_INCLUDES KNEPOMUK_LIBRARIES )
 
-if(KNEPOMUK_FOUND)
-   if(NOT KNepomuk_FIND_QUIETLY)
-   	message(STATUS "Found KNepomuk: ${KNEPOMUK_LIBRARIES}")
-   endif(NOT KNepomuk_FIND_QUIETLY)
-else(KNEPOMUK_FOUND)
-  if(KNepomuk_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find KNepomuk library.")
-  endif(KNepomuk_FIND_REQUIRED)
-endif(KNEPOMUK_FOUND)
 
 MARK_AS_ADVANCED(KNEPOMUK_INCLUDES KNEPOMUK_LIBRARIES)
 
diff --git a/modules/FindNetworkManager.cmake b/modules/FindNetworkManager.cmake
index cbaae5f1..e931d091 100644
--- a/modules/FindNetworkManager.cmake
+++ b/modules/FindNetworkManager.cmake
@@ -3,7 +3,7 @@
 #
 #  NETWORKMANAGER_FOUND - system has NetworkManager
 #  NETWORKMANAGER_INCLUDE_DIR - the NetworkManager include directory
-#  NETWORKMANAGER_LIBRARIES - the libraries needed to use NetworkManager
+#  NETWORKMANAGER_LIBRARY - the libraries needed to use NetworkManager
 #  NETWORKMANAGER_DEFINITIONS - Compiler switches required for using NetworkManager
 
 # Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
diff --git a/modules/FindSqlite.cmake b/modules/FindSqlite.cmake
index b1a4ecba..fdf09c32 100644
--- a/modules/FindSqlite.cmake
+++ b/modules/FindSqlite.cmake
@@ -31,20 +31,10 @@ else (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
     PATHS
     ${_SQLITELinkDir}
   )
+ 
   
-  if (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
-     set(SQLITE_FOUND TRUE)
-  endif (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
-  
-  if (SQLITE_FOUND)
-    if (NOT Sqlite_FIND_QUIETLY)
-      message(STATUS "Found SQLITE: ${SQLITE_LIBRARIES}")
-    endif (NOT Sqlite_FIND_QUIETLY)
-  else (SQLITE_FOUND)
-    if (Sqlite_FIND_REQUIRED)
-      message(FATAL_ERROR "Could NOT find SQLITE")
-    endif (Sqlite_FIND_REQUIRED)
-  endif (SQLITE_FOUND)
+  include(FindPackageHandleStandardArgs)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sqlite DEFAULT_MSG SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES )
   
   MARK_AS_ADVANCED(SQLITE_INCLUDE_DIR SQLITE_LIBRARIES)
   
diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake
index 3cf32e79..a85ada8a 100644
--- a/modules/FindStrigi.cmake
+++ b/modules/FindStrigi.cmake
@@ -5,7 +5,6 @@
 #  STRIGI_INCLUDE_DIR - the Strigi include directory
 #  STRIGI_STREAMANALYZER_LIBRARY - Link these to use Strigi streamanalyzer
 #  STRIGI_STREAMS_LIBRARY - Link these to use Strigi streams
-#  STRIGI_LIBRARIES - Link these to use both Strigi libraries
 
 
 set(STRIGI_MIN_VERSION "0.5.3")
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake
index 94b0ce10..49323d49 100644
--- a/modules/KDE4Macros.cmake
+++ b/modules/KDE4Macros.cmake
@@ -20,7 +20,6 @@
 # KDE4_REMOVE_OBSOLETE_CMAKE_FILES
 # KDE4_NO_ENABLE_FINAL
 # KDE4_CREATE_HANDBOOK
-# KDE4_CREATE_HTML_HANDBOOK
 # KDE4_INSTALL_HANDBOOK
 
 # Copyright (c) 2006, 2007, Alexander Neundorf, <neundorf@kde.org>