diff options
| author | Adriaan de Groot <groot@kde.org> | 2007-08-20 11:32:21 +0000 |
|---|---|---|
| committer | Adriaan de Groot <groot@kde.org> | 2007-08-20 11:32:21 +0000 |
| commit | 2f57dbc1a730680bdf1376a61a83c14b78245b8b (patch) | |
| tree | 0cbf43cbbf185971768689e488a65b0fab9b7b08 | |
| parent | 2abb23d445acbc16177f684a000cd12c62ee1c1f (diff) | |
| download | extra-cmake-modules-2f57dbc1a730680bdf1376a61a83c14b78245b8b.tar.gz extra-cmake-modules-2f57dbc1a730680bdf1376a61a83c14b78245b8b.tar.bz2 | |
If Strigi is found via pkg-config but not found in the normal installation paths, (double) check in the directories returned by pkg-config. Handles the case where Strigi is installed in a different prefix from KDE.
svn path=/trunk/KDE/kdelibs/; revision=702314
| -rw-r--r-- | modules/FindStrigi.cmake | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index a85ada8a..55fec492 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -53,6 +53,18 @@ if (NOT WIN32 AND NOT HAVE_STRIGI_VERSION) message(STATUS "Found Strigi >= ${STRIGI_MIN_VERSION}") endif(NOT Strigi_FIND_QUIETLY) endif(NOT _return_VALUE STREQUAL "0") + if (NOT STRIGI_STREAMANALYZER_LIBRARY) + find_library(STRIGI_STREAMANALYZER_LIBRARY NAMES streamanalyzer + PATHS ${_dummyLinkDir}) + endif(NOT STRIGI_STREAMANALYZER_LIBRARY) + if (NOT STRIGI_STREAMS_LIBRARY) + find_library(STRIGI_STREAMS_LIBRARY NAMES streams + PATHS ${_dummyLinkDir}) + endif(NOT STRIGI_STREAMS_LIBRARY) + if (NOT STRIGI_INCLUDE_DIR) + find_path(STRIGI_INCLUDE_DIR strigi/streamanalyzer.h + PATHS ${_dummyIncDir}) + endif(NOT STRIGI_INCLUDE_DIR) else(_dummyLinkFlags) message(STATUS "pkgconfig didn't find strigi, couldn't check strigi version") endif(_dummyLinkFlags) @@ -62,3 +74,4 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Strigi "Couldn't find Strigi streams library in $STRIGI_HOME/lib, ${CMAKE_INSTALL_PREFIX}/lib, ${_program_FILES_DIR}/strigi/lib" STRIGI_STREAMS_LIBRARY STRIGI_STREAMANALYZER_LIBRARY STRIGI_INCLUDE_DIR) + |