From 56615f2661cbbe7b0b2b86224bee8134524b82ee Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 13 Jul 2007 07:42:02 +0000 Subject: kde variable is not defined at the begining into kdelibs and if we search directly into include_install_dir Remove old compatibility variable svn path=/trunk/KDE/kdelibs/; revision=687269 --- modules/FindStrigi.cmake | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'modules') diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index 04d6c2c1..fada801c 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -16,26 +16,22 @@ endif(WIN32) FIND_PATH(STRIGI_INCLUDE_DIR strigi/streamanalyzer.h PATHS $ENV{STRIGI_HOME}/include - ${INCLUDE_INSTALL_DIR} + ${CMAKE_INSTALL_PREFIX}/include ${_program_FILES_DIR}/strigi/include ) FIND_LIBRARY(STRIGI_STREAMANALYZER_LIBRARY NAMES streamanalyzer PATHS $ENV{STRIGI_HOME}/lib - ${LIB_INSTALL_DIR} + ${CMAKE_INSTALL_PREFIX}/lib ${_program_FILES_DIR}/strigi/lib ) FIND_LIBRARY(STRIGI_STREAMS_LIBRARY NAMES streams PATHS $ENV{STRIGI_HOME}/lib - ${LIB_INSTALL_DIR} + ${CMAKE_INSTALL_PREFIX}/lib ${_program_FILES_DIR}/strigi/lib ) -# 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 STRIGI_STREAMANALYZER_LIBRARY AND STRIGI_STREAMS_LIBRARY) -- cgit v1.2.1