diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2009-11-22 14:20:16 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2009-11-22 14:20:16 +0000 |
| commit | 0dceb8f7a8c3f8bfcf946d07c864d6178afa315e (patch) | |
| tree | 9850035ef0afd33cdfbde6515ca390b9c30b0e1c | |
| parent | 4262fee3c51bbcb849cc7ec2affafe6e6663c457 (diff) | |
| download | extra-cmake-modules-0dceb8f7a8c3f8bfcf946d07c864d6178afa315e.tar.gz extra-cmake-modules-0dceb8f7a8c3f8bfcf946d07c864d6178afa315e.tar.bz2 | |
-use HINTS instead of PATHS for searching (directories listed with HINTS are searched before the standard dirs, directories listed after PATHS are searched after the standard dirs)
-fix the upper/lower casing of Nepomuk
-also call find_package_handle_standard_args() if soprano was not found
Alex
CCMAIL: <trueg@kde.org>
svn path=/trunk/KDE/kdelibs/; revision=1052796
| -rw-r--r-- | modules/FindNepomuk.cmake | 69 |
1 files changed, 31 insertions, 38 deletions
diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index b406068c..bc7e5470 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -23,45 +23,38 @@ endif (NOT DEFINED Soprano_FOUND) if (Soprano_FOUND) - set (NEPOMUK_FIND_REQUIRED ${Nepomuk_FIND_REQUIRED}) - if (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES AND NEPOMUK_QUERY_LIBRARIES) + find_path(NEPOMUK_INCLUDE_DIR + NAMES + nepomuk/global.h + HINTS + ${KDE4_INCLUDE_DIR} + ${INCLUDE_INSTALL_DIR} + ) + + find_library(NEPOMUK_LIBRARIES + NAMES + nepomuk + HINTS + ${KDE4_LIB_DIR} + ${LIB_INSTALL_DIR} + ) + + find_library(NEPOMUK_QUERY_LIBRARIES + NAMES + nepomukquery + HINTS + ${KDE4_LIB_DIR} + ${LIB_INSTALL_DIR} + ) + + mark_as_advanced(NEPOMUK_INCLUDE_DIR NEPOMUK_LIBRARIES NEPOMUK_QUERY_LIBRARIES) - # Already in cache, be silent - set(NEPOMUK_FIND_QUIETLY TRUE) - - else (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES AND NEPOMUK_QUERY_LIBRARIES) - find_path(NEPOMUK_INCLUDE_DIR - NAMES - nepomuk/global.h - PATHS - ${KDE4_INCLUDE_DIR} - ${INCLUDE_INSTALL_DIR} - ) - - find_library(NEPOMUK_LIBRARIES - NAMES - nepomuk - PATHS - ${KDE4_LIB_DIR} - ${LIB_INSTALL_DIR} - ) - - find_library(NEPOMUK_QUERY_LIBRARIES - NAMES - nepomukquery - PATHS - ${KDE4_LIB_DIR} - ${LIB_INSTALL_DIR} - ) - - mark_as_advanced(NEPOMUK_INCLUDE_DIR NEPOMUK_LIBRARIES) +endif (Soprano_FOUND) - endif (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES AND NEPOMUK_QUERY_LIBRARIES) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Nepomuk DEFAULT_MSG + NEPOMUK_LIBRARIES NEPOMUK_INCLUDE_DIR) - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(NEPOMUK DEFAULT_MSG - NEPOMUK_LIBRARIES NEPOMUK_INCLUDE_DIR) - #to retain backward compatibility - set (Nepomuk_FOUND ${NEPOMUK_FOUND}) +#to retain backward compatibility +set (Nepomuk_FOUND ${NEPOMUK_FOUND}) -endif (Soprano_FOUND) |