diff options
| author | Laurent Montel <montel@kde.org> | 2007-06-13 20:04:34 +0000 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2007-06-13 20:04:34 +0000 |
| commit | 4d4782aeaa3d342bcc73554826fd7f01cb7e8b7d (patch) | |
| tree | b6d1f02dc57d52524a4e34b212c5c9ae5592a4fb | |
| parent | 58a376c46e496cf3c57d82a45a998fc19b05b06b (diff) | |
| download | extra-cmake-modules-4d4782aeaa3d342bcc73554826fd7f01cb7e8b7d.tar.gz extra-cmake-modules-4d4782aeaa3d342bcc73554826fd7f01cb7e8b7d.tar.bz2 | |
Minor fix
svn path=/trunk/KDE/kdelibs/; revision=675178
| -rw-r--r-- | modules/FindPostgreSQL.cmake | 20 | ||||
| -rw-r--r-- | modules/FindSasl2.cmake | 4 |
2 files changed, 20 insertions, 4 deletions
diff --git a/modules/FindPostgreSQL.cmake b/modules/FindPostgreSQL.cmake index db657240..d72aae8c 100644 --- a/modules/FindPostgreSQL.cmake +++ b/modules/FindPostgreSQL.cmake @@ -11,6 +11,12 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. +if (POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) + # Already in cache, be silent + set(PostgreSQL_FIND_QUIETLY TRUE) +endif (POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) + + find_path(POSTGRESQL_INCLUDE_DIR libpq-fe.h /usr/include/pgsql /usr/local/include/pgsql @@ -24,11 +30,17 @@ find_library(POSTGRESQL_LIBRARIES NAMES pq if(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) set(POSTGRESQL_FOUND TRUE) - message(STATUS "Found PostgreSQL: ${POSTGRESQL_INCLUDE_DIR}, ${POSTGRESQL_LIBRARIES}") -else(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) - set(POSTGRESQL_FOUND FALSE) - message(STATUS "PostgreSQL not found.") endif(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) +if(POSTGRESQL_FOUND) + if (NOT PostgreSQL_FIND_QUIETLY) + message(STATUS "Found PostgreSQL: ${POSTGRESQL_INCLUDE_DIR}, ${POSTGRESQL_LIBRARIES}") + endif(NOT PostgreSQL_FIND_QUIETLY) +else(POSTGRESQL_FOUND) + if (PostgreSQL_FIND_REQUIRED) + message(FATAL_ERROR "PostgreSQL not found.") + endif(PostgreSQL_FIND_REQUIRED) +endif(POSTGRESQL_FOUND) + mark_as_advanced(POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES) diff --git a/modules/FindSasl2.cmake b/modules/FindSasl2.cmake index 1f8603d7..855e21c8 100644 --- a/modules/FindSasl2.cmake +++ b/modules/FindSasl2.cmake @@ -37,6 +37,10 @@ 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) MARK_AS_ADVANCED(SASL2_INCLUDE_DIR SASL2_LIBRARIES) |