From 3ecd37f6b268d32580e8e1c4275b5813a18bb3d4 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 6 Apr 2007 08:51:15 +0000 Subject: [PATCH] Fix when modules is required svn path=/trunk/kdesupport/qca/; revision=651037 --- cmake/modules/FindBotan.cmake | 13 ++++++++++++- cmake/modules/FindLibGcrypt.cmake | 15 ++++++++++++--- cmake/modules/FindSasl2.cmake | 7 ++++++- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/cmake/modules/FindBotan.cmake b/cmake/modules/FindBotan.cmake index 210736d1..725b2892 100644 --- a/cmake/modules/FindBotan.cmake +++ b/cmake/modules/FindBotan.cmake @@ -32,9 +32,20 @@ IF(BOTANCONFIG_EXECUTABLE) IF(BOTAN_LIBRARIES) SET(BOTAN_FOUND TRUE) - message(STATUS "Found Botan: ${BOTAN_LIBRARIES}") ENDIF(BOTAN_LIBRARIES) MARK_AS_ADVANCED(BOTAN_CFLAGS BOTAN_LIBRARIES) ENDIF(BOTANCONFIG_EXECUTABLE) + +if (BOTAN_FOUND) + if (NOT Botan_FIND_QUIETLY) + message(STATUS "Found Botan: ${BOTAN_LIBRARIES}") + endif (NOT Botan_FIND_QUIETLY) +else (BOTAN_FOUND) + if (Botan_FIND_REQUIRED) + message(FATAL_ERROR "Could not find Botan libraries") + endif (Botan_FIND_REQUIRED) +endif (BOTAN_FOUND) + + diff --git a/cmake/modules/FindLibGcrypt.cmake b/cmake/modules/FindLibGcrypt.cmake index 33c33af2..049c06e2 100644 --- a/cmake/modules/FindLibGcrypt.cmake +++ b/cmake/modules/FindLibGcrypt.cmake @@ -32,9 +32,18 @@ IF(LIBGCRYPTCONFIG_EXECUTABLE) IF(LIBGCRYPT_LIBRARIES AND LIBGCRYPT_CFLAGS) SET(LIBGCRYPT_FOUND TRUE) - message(STATUS "Found libgcrypt: ${LIBGCRYPT_LIBRARIES}") ENDIF(LIBGCRYPT_LIBRARIES AND LIBGCRYPT_CFLAGS) - MARK_AS_ADVANCED(LIBGCRYPT_CFLAGS LIBGCRYPT_LIBRARIES) - ENDIF(LIBGCRYPTCONFIG_EXECUTABLE) + +if (LIBGCRYPT_FOUND) + if (NOT LibGcrypt_FIND_QUIETLY) + message(STATUS "Found libgcrypt: ${LIBGCRYPT_LIBRARIES}") + endif (NOT LibGcrypt_FIND_QUIETLY) +else (LIBGCRYPT_FOUND) + if (LibGcrypt_FIND_REQUIRED) + message(FATAL_ERROR "Could not find libgcrypt libraries") + endif (LibGcrypt_FIND_REQUIRED) +endif (LIBGCRYPT_FOUND) + +MARK_AS_ADVANCED(LIBGCRYPT_CFLAGS LIBGCRYPT_LIBRARIES) diff --git a/cmake/modules/FindSasl2.cmake b/cmake/modules/FindSasl2.cmake index 1f8603d7..433468cc 100644 --- a/cmake/modules/FindSasl2.cmake +++ b/cmake/modules/FindSasl2.cmake @@ -35,9 +35,14 @@ endif (SASL2_INCLUDE_DIR AND SASL2_LIBRARIES) if (SASL2_FOUND) if (NOT Sasl2_FIND_QUIETLY) - message(STATUS "Found sasl2: ${SASL2_LIBRARIES}") + message(STATUS "Found Sasl2: ${SASL2_LIBRARIES}") endif (NOT Sasl2_FIND_QUIETLY) +else (SASL2_FOUND) + if (Sasl2_FIND_REQUIRED) + message(FATAL_ERROR "Could not find sasl2 libraries") + endif (Sasl2_FIND_REQUIRED) endif (SASL2_FOUND) + MARK_AS_ADVANCED(SASL2_INCLUDE_DIR SASL2_LIBRARIES)