aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHelio Castro <helio@kde.org>2008-11-11 21:20:07 +0000
committerHelio Castro <helio@kde.org>2008-11-11 21:20:07 +0000
commitb5a5c267ffa16d88c3236bbc0f5cd4ee32bea4a8 (patch)
tree21ad9a31d724577be8697d78336eff7ca21473a1
parent70e18058aefcd52684a8a9803995eadffbf526d3 (diff)
downloadextra-cmake-modules-b5a5c267ffa16d88c3236bbc0f5cd4ee32bea4a8.tar.gz
extra-cmake-modules-b5a5c267ffa16d88c3236bbc0f5cd4ee32bea4a8.tar.bz2
- Add cmake_home as a first test
svn path=/trunk/KDE/kdelibs/; revision=883006
-rw-r--r--modules/FindStrigi.cmake18
1 files changed, 10 insertions, 8 deletions
diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake
index 666ae22a..4bd07898 100644
--- a/modules/FindStrigi.cmake
+++ b/modules/FindStrigi.cmake
@@ -16,24 +16,26 @@ if(NOT STRIGI_MIN_VERSION)
set(STRIGI_MIN_VERSION "0.5.9")
endif(NOT STRIGI_MIN_VERSION)
-if (NOT WIN32)
- find_package(PkgConfig)
- if(PKG_CONFIG_EXECUTABLE)
- pkg_check_modules(STRIGI libstreamanalyzer>=${STRIGI_MIN_VERSION})
- endif(PKG_CONFIG_EXECUTABLE)
-endif(NOT WIN32)
-
if (WIN32)
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR)
endif(WIN32)
file(TO_CMAKE_PATH "$ENV{STRIGI_HOME}" strigi_home)
+if (NOT WIN32)
+ if(NOT strigi_home)
+ find_package(PkgConfig)
+ if(PKG_CONFIG_EXECUTABLE)
+ pkg_check_modules(STRIGI libstreamanalyzer>=${STRIGI_MIN_VERSION})
+ endif(PKG_CONFIG_EXECUTABLE)
+ endif(NOT strigi_home)
+endif(NOT WIN32)
+
if (NOT STRIGI_INCLUDEDIR)
find_path(STRIGI_INCLUDEDIR strigi/streamanalyzer.h
PATHS
${strigi_home}/include
- ${_STRIGI_INCLUDEDIR}
+ ${STRIGI_INCLUDEDIR}
${_program_FILES_DIR}/strigi/include
)
endif (NOT STRIGI_INCLUDEDIR)