diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2007-03-14 06:03:35 +0000 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2007-03-14 06:03:35 +0000 |
| commit | 828dd42ef64874855b0c9fd7a81c1a672797db73 (patch) | |
| tree | 55ad8fe65129b05bdabe7a3ee28e1d9edf3dfea4 | |
| parent | b6b882c4eff0f697fd6405ec2127e2cce0086d06 (diff) | |
| download | extra-cmake-modules-828dd42ef64874855b0c9fd7a81c1a672797db73.tar.gz extra-cmake-modules-828dd42ef64874855b0c9fd7a81c1a672797db73.tar.bz2 | |
need both strigi libs on win32
FIXME: don't search for libs when they're already in the cache
svn path=/trunk/KDE/kdelibs/; revision=642355
| -rw-r--r-- | modules/FindStrigi.cmake | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index a8f649e3..a421c9cf 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -4,6 +4,8 @@ # STRIGI_FOUND - system has Strigi # STRIGI_INCLUDE_DIR - the Strigi include directory # STREAMINDEXER_LIBRARY - Link these to use Strigi streamindexer +# STREAMS_LIBRARY - Link these to use Strigi streams +# STRIGI_LIBRARIES - Link these to use both Strigi libraries # if (WIN32) @@ -26,14 +28,24 @@ FIND_LIBRARY(STREAMINDEXER_LIBRARY NAMES streamindexer ${CMAKE_INSTALL_PREFIX}/lib ${_program_FILES_DIR}/strigi/lib ) +FIND_LIBRARY(STREAMS_LIBRARY NAMES streams + PATHS + /usr/lib + /usr/local/lib + $ENV{STRIGI_HOME}/lib + ${CMAKE_INSTALL_PREFIX}/lib + ${_program_FILES_DIR}/strigi/lib +) -IF(STRIGI_INCLUDE_DIR AND STREAMINDEXER_LIBRARY) +IF(STRIGI_INCLUDE_DIR AND STREAMINDEXER_LIBRARY AND STREAMS_LIBRARY) SET(STRIGI_FOUND TRUE) -ENDIF(STRIGI_INCLUDE_DIR AND STREAMINDEXER_LIBRARY) +ENDIF(STRIGI_INCLUDE_DIR AND STREAMINDEXER_LIBRARY AND STREAMS_LIBRARY) IF(STRIGI_FOUND) + SET(STRIGI_LIBRARIES ${STREAMINDEXER_LIBRARY} ${STREAMS_LIBRARY}) IF(NOT Strigi_FIND_QUIETLY) MESSAGE(STATUS "Found Strigi: ${STREAMINDEXER_LIBRARY}") + MESSAGE(STATUS "Found Strigi: ${STREAMS_LIBRARY}") ENDIF(NOT Strigi_FIND_QUIETLY) ELSE(STRIGI_FOUND) IF(Strigi_FIND_REQUIRED) |