diff options
| author | Dominik Haumann <dhaumann@kde.org> | 2007-03-15 16:06:30 +0000 |
|---|---|---|
| committer | Dominik Haumann <dhaumann@kde.org> | 2007-03-15 16:06:30 +0000 |
| commit | e1a140ccdc09a0dd00aa644090023589bcea8349 (patch) | |
| tree | b934637f62e888ed67db36ae611e15584e4cc59b | |
| parent | 8694b07f56414243f1f6fc4548d557ecb59b7059 (diff) | |
| download | extra-cmake-modules-e1a140ccdc09a0dd00aa644090023589bcea8349.tar.gz extra-cmake-modules-e1a140ccdc09a0dd00aa644090023589bcea8349.tar.bz2 | |
cmake variables should all be prefixed, so use STRIGI_ for all variables in FindStrigi.cmake
CCMAIL: Jos van den Oever <jos@vandenoever.info>
Alex@dhs box
svn path=/trunk/KDE/kdelibs/; revision=642853
| -rw-r--r-- | modules/FindStrigi.cmake | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index 28f0851c..a944b5bd 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -3,10 +3,11 @@ # # STRIGI_FOUND - system has Strigi # STRIGI_INCLUDE_DIR - the Strigi include directory -# STREAMANALYZER_LIBRARY - Link these to use Strigi streamanalyzer -# STREAMS_LIBRARY - Link these to use Strigi streams +# STRIGI_STREAMANALYZER_LIBRARY - Link these to use Strigi streamanalyzer +# STRIGI_STREAMS_LIBRARY - Link these to use Strigi streams # STRIGI_LIBRARIES - Link these to use both Strigi libraries -# + + if (WIN32) file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) @@ -14,38 +15,36 @@ endif(WIN32) FIND_PATH(STRIGI_INCLUDE_DIR strigi/streamanalyzer.h PATHS - /usr/include - /usr/local/include $ENV{STRIGI_HOME}/include ${CMAKE_INSTALL_PREFIX}/include ${_program_FILES_DIR}/strigi/include ) -FIND_LIBRARY(STREAMANALYZER_LIBRARY NAMES streamanalyzer +FIND_LIBRARY(STRIGI_STREAMANALYZER_LIBRARY NAMES streamanalyzer PATHS - /usr/lib - /usr/local/lib $ENV{STRIGI_HOME}/lib ${CMAKE_INSTALL_PREFIX}/lib ${_program_FILES_DIR}/strigi/lib ) -FIND_LIBRARY(STREAMS_LIBRARY NAMES streams +FIND_LIBRARY(STRIGI_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 STREAMANALYZER_LIBRARY AND STREAMS_LIBRARY) +# for compatibility, remove ASAP (next BC monday), Alex +SET(STREAMANALYZER_LIBRARY ${STRIGI_STREAMANALYZER_LIBRARY} ) +SET(STREAMS_LIBRARY ${STRIGI_STREAMS_LIBRARY}) + +IF(STRIGI_INCLUDE_DIR AND STRIGI_STREAMANALYZER_LIBRARY AND STRIGI_STREAMS_LIBRARY) SET(STRIGI_FOUND TRUE) -ENDIF(STRIGI_INCLUDE_DIR AND STREAMANALYZER_LIBRARY AND STREAMS_LIBRARY) +ENDIF(STRIGI_INCLUDE_DIR AND STRIGI_STREAMANALYZER_LIBRARY AND STRIGI_STREAMS_LIBRARY) IF(STRIGI_FOUND) - SET(STRIGI_LIBRARIES ${STREAMANALYZER_LIBRARY} ${STREAMS_LIBRARY}) + SET(STRIGI_LIBRARIES ${STRIGI_STREAMANALYZER_LIBRARY} ${STRIGI_STREAMS_LIBRARY}) IF(NOT Strigi_FIND_QUIETLY) - MESSAGE(STATUS "Found Strigi: ${STREAMANALYZER_LIBRARY}") - MESSAGE(STATUS "Found Strigi: ${STREAMS_LIBRARY}") + MESSAGE(STATUS "Found Strigi: ${STRIGI_STREAMANALYZER_LIBRARY}") + MESSAGE(STATUS "Found Strigi: ${STRIGI_STREAMS_LIBRARY}") ENDIF(NOT Strigi_FIND_QUIETLY) ELSE(STRIGI_FOUND) IF(Strigi_FIND_REQUIRED) |