aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Montel <montel@kde.org>2007-08-08 07:48:20 +0000
committerLaurent Montel <montel@kde.org>2007-08-08 07:48:20 +0000
commit4642fd327fdf3f7b1f660bd066bb38ee41e2f401 (patch)
treedf848579f1cb37be4e08840b1705e5b15621fc95
parent690417dad6d76147043d0295decc7982ab9245e5 (diff)
downloadextra-cmake-modules-4642fd327fdf3f7b1f660bd066bb38ee41e2f401.tar.gz
extra-cmake-modules-4642fd327fdf3f7b1f660bd066bb38ee41e2f401.tar.bz2
Use FIND_PACKAGE_HANDLE_STANDARD_ARGS
svn path=/trunk/KDE/kdelibs/; revision=697621
-rw-r--r--modules/FindKdepim.cmake15
-rw-r--r--modules/FindSasl2.cmake19
2 files changed, 5 insertions, 29 deletions
diff --git a/modules/FindKdepim.cmake b/modules/FindKdepim.cmake
index f468c883..d04886af 100644
--- a/modules/FindKdepim.cmake
+++ b/modules/FindKdepim.cmake
@@ -24,19 +24,8 @@ FIND_LIBRARY(KDEPIM_LIBRARIES NAMES kdepim
${LIB_INSTALL_DIR}
)
-if (KDEPIM_LIBRARIES AND KDEPIM_INCLUDE_DIR)
- set(KDEPIM_FOUND TRUE)
-endif (KDEPIM_LIBRARIES AND KDEPIM_INCLUDE_DIR)
-
-if (KDEPIM_FOUND)
- if (NOT Kdepim_FIND_QUIETLY)
- message(STATUS "Found Kdepim: ${KDEPIM_LIBRARIES}")
- endif (NOT Kdepim_FIND_QUIETLY)
-else (KDEPIM_FOUND)
- if (Kdepim_FIND_REQUIRED)
- message(FATAL_ERROR "Could NOT find Kdepim")
- endif (Kdepim_FIND_REQUIRED)
-endif (KDEPIM_FOUND)
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Kdepim DEFAULT_MSG KDEPIM_LIBRARIES KDEPIM_INCLUDE_DIR )
MARK_AS_ADVANCED(KDEPIM_INCLUDE_DIR KDEPIM_LIBRARIES)
diff --git a/modules/FindSasl2.cmake b/modules/FindSasl2.cmake
index f9144bfe..f69aea6f 100644
--- a/modules/FindSasl2.cmake
+++ b/modules/FindSasl2.cmake
@@ -5,7 +5,7 @@
# SASL2_INCLUDE_DIR - the SASL2 include directory
# SASL2_LIBRARIES - The libraries needed to use SASL2
#
-# 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.
@@ -22,21 +22,8 @@ FIND_PATH(SASL2_INCLUDE_DIR sasl/sasl.h
FIND_LIBRARY(SASL2_LIBRARIES NAMES sasl2
)
-
-if (SASL2_INCLUDE_DIR AND SASL2_LIBRARIES)
- set(SASL2_FOUND TRUE)
-endif (SASL2_INCLUDE_DIR AND SASL2_LIBRARIES)
-
-
-if (SASL2_FOUND)
- if (NOT Sasl2_FIND_QUIETLY)
- message(STATUS "Found sasl2: ${SASL2_LIBRARIES}")
- endif (NOT Sasl2_FIND_QUIETLY)
-else(SASL2_FOUND)
- if (Sasl2_FIND_REQUIRED)
- message(FATAL_ERROR "Could NOT find sals2 library")
- endif (Sasl2_FIND_REQUIRED)
-endif (SASL2_FOUND)
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sasl2 DEFAULT_MSG SASL2_INCLUDE_DIR SASL2_LIBRARIES)
MARK_AS_ADVANCED(SASL2_INCLUDE_DIR SASL2_LIBRARIES)