diff options
| author | Jos van den Oever <jos@vandenoever.info> | 2008-08-29 19:12:18 +0000 |
|---|---|---|
| committer | Jos van den Oever <jos@vandenoever.info> | 2008-08-29 19:12:18 +0000 |
| commit | 07fcb50e1a92947ebdd2f998b52cfddc73d9349a (patch) | |
| tree | a4d4711ede0e258f84d60ace3293ccafd86c1210 | |
| parent | 37d4f9d760d27f5c9236ca4cfcad837f27827ebf (diff) | |
| download | extra-cmake-modules-07fcb50e1a92947ebdd2f998b52cfddc73d9349a.tar.gz extra-cmake-modules-07fcb50e1a92947ebdd2f998b52cfddc73d9349a.tar.bz2 | |
Fix Strigi detection to use a version from the 0.5 branch and to not use a newer version.
svn path=/branches/KDE/4.1/kdelibs/; revision=854554
| -rw-r--r-- | modules/FindStrigi.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index a3725a90..83ac283f 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -17,6 +17,9 @@ include(FindLibraryWithDebug) if(NOT STRIGI_MIN_VERSION) set(STRIGI_MIN_VERSION "0.5.9") endif(NOT STRIGI_MIN_VERSION) +if(NOT STRIGI_MAX_VERSION) + set(STRIGI_MAX_VERSION "0.5.99") +endif(NOT STRIGI_MAX_VERSION) if (WIN32) file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) @@ -82,7 +85,7 @@ if (NOT WIN32 AND NOT HAVE_STRIGI_VERSION) # if pkgconfig found strigi, check the version, otherwise print a warning if(_dummyLinkFlags) - exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${STRIGI_MIN_VERSION} + exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${STRIGI_MIN_VERSION} --max-version=${STRIGI_MAX_VERSION} libstreamanalyzer RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) if(NOT _return_VALUE STREQUAL "0") |