aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorLaurent Montel <montel@kde.org>2007-08-08 07:36:11 +0000
committerLaurent Montel <montel@kde.org>2007-08-08 07:36:11 +0000
commit690417dad6d76147043d0295decc7982ab9245e5 (patch)
treee304dc454292a42fb7813373f69c0166f1a4134b /modules
parent9d32d67f6a70cb867a26400b6107f3ed7600c3eb (diff)
downloadextra-cmake-modules-690417dad6d76147043d0295decc7982ab9245e5.tar.gz
extra-cmake-modules-690417dad6d76147043d0295decc7982ab9245e5.tar.bz2
Use FIND_PACKAGE_HANDLE_STANDARD_ARGS
svn path=/trunk/KDE/kdelibs/; revision=697619
Diffstat (limited to 'modules')
-rw-r--r--modules/FindBlueZ.cmake16
-rw-r--r--modules/FindPCRE.cmake15
2 files changed, 4 insertions, 27 deletions
diff --git a/modules/FindBlueZ.cmake b/modules/FindBlueZ.cmake
index 9435258e..8db4a08b 100644
--- a/modules/FindBlueZ.cmake
+++ b/modules/FindBlueZ.cmake
@@ -29,19 +29,7 @@ find_library(BLUEZ_LIBRARIES NAMES bluetooth
${_BlueZLinkDir}
)
-if (BLUEZ_LIBRARIES AND BLUEZ_INCLUDE_DIR)
- set(BLUEZ_FOUND TRUE)
-endif (BLUEZ_LIBRARIES AND BLUEZ_INCLUDE_DIR)
-
-
-IF (BLUEZ_FOUND)
- if (NOT BlueZ_FIND_QUIETLY)
- message(STATUS "Found bluez: ${BLUEZ_LIBRARIES}")
- endif (NOT BlueZ_FIND_QUIETLY)
-ELSE(BLUEZ_FOUND)
- IF (BlueZ_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could NOT find BlueZ")
- ENDIF (BlueZ_FIND_REQUIRED)
-ENDIF (BLUEZ_FOUND)
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(BlueZ DEFAULT_MSG BLUEZ_LIBRARIES BLUEZ_INCLUDE_DIR )
mark_as_advanced( BLUEZ_LIBRARIES BLUEZ_INCLUDE_DIR)
diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake
index 8989130f..a3469e59 100644
--- a/modules/FindPCRE.cmake
+++ b/modules/FindPCRE.cmake
@@ -24,18 +24,7 @@ FIND_LIBRARY(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix)
set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE")
-if (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)
- set(PCRE_FOUND TRUE)
-endif (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)
-
-if (PCRE_FOUND)
- if (NOT PCRE_FIND_QUIETLY)
- message(STATUS "Found PCRE: ${PCRE_LIBRARIES}")
- endif (NOT PCRE_FIND_QUIETLY)
-else (PCRE_FOUND)
- if (PCRE_FIND_REQUIRED)
- message(FATAL_ERROR "Could NOT find PCRE")
- endif (PCRE_FIND_REQUIRED)
-endif (PCRE_FOUND)
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_LIBRARIES )
MARK_AS_ADVANCED(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY)