diff options
| author | Will Stephenson <wstephenson@kde.org> | 2007-01-13 14:32:54 +0000 |
|---|---|---|
| committer | Will Stephenson <wstephenson@kde.org> | 2007-01-13 14:32:54 +0000 |
| commit | 0a20a5f0e83606c4ebe5e1685871b5b61fb160df (patch) | |
| tree | 8ae8177dadfbce824e0ebe80b2790a244b6f680b | |
| parent | f0c114351d0d63d0a649d8fd147b7c8e2f3cb502 (diff) | |
| download | extra-cmake-modules-0a20a5f0e83606c4ebe5e1685871b5b61fb160df.tar.gz extra-cmake-modules-0a20a5f0e83606c4ebe5e1685871b5b61fb160df.tar.bz2 | |
Tidy up QCA2 check
svn path=/trunk/KDE/kdelibs/; revision=622942
| -rw-r--r-- | modules/FindQCA2.cmake | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/modules/FindQCA2.cmake b/modules/FindQCA2.cmake index a82a6f63..d302a186 100644 --- a/modules/FindQCA2.cmake +++ b/modules/FindQCA2.cmake @@ -16,8 +16,8 @@ if (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES) - # in cache allready - set(QCA2_FOUND TRUE) + # in cache already + set(QCA2_FOUND TRUE) else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES) @@ -26,7 +26,6 @@ else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES) IF (NOT WIN32) PKGCONFIG(qca _Qca2IncDir _Qca2LinkDir _Qca2LinkFlags _Qca2Cflags) - MESSAGE(STATUS "pkg-config returned ${_Qca2IncDir} for QCA 2 includes") set(QCA2_DEFINITIONS ${_Qca2Cflags}) ENDIF (NOT WIN32) @@ -35,27 +34,25 @@ else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES) ${_Qca2IncDir} ) - MESSAGE(STATUS "QCA2_INCLUDE_DIR has value ${QCA2_INCLUDE_DIR}" ) - FIND_LIBRARY(QCA2_LIBRARIES NAMES qca PATHS - ${_Qca2LinkDir} - NO_DEFAULT_PATH + ${_Qca2LinkDir} + NO_DEFAULT_PATH ) if (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES) set(QCA2_FOUND TRUE) - endif (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES) - - if (QCA2_FOUND) - if (NOT QCA2_FIND_QUIETLY) - message(STATUS "Found QCA2: ${QCA2_LIBRARIES}") - endif (NOT QCA2_FIND_QUIETLY) - else (QCA2_FOUND) + else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES) + if (NOT QCA2_INCLUDE_DIR) + message(STATUS "Could NOT find QCA2 includes in ${_Qca2IncDir}") + endif (NOT QCA2_INCLUDE_DIR) + if (NOT QCA2_LIBRARIES) + message(STATUS "Could not find QCA2 libraries in ${_Qca2LinkDir}") + endif (NOT QCA2_LIBRARIES) if (QCA2_FIND_REQUIRED) message(SEND_ERROR "Could NOT find QCA2") endif (QCA2_FIND_REQUIRED) - endif (QCA2_FOUND) + endif (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES) MARK_AS_ADVANCED(QCA2_INCLUDE_DIR QCA2_LIBRARIES) |