diff options
| author | David Faure <faure@kde.org> | 2008-09-13 00:31:05 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2008-09-13 00:31:05 +0000 |
| commit | 616b0b0e3e8e0c001aa151a7babe1463f6c0a541 (patch) | |
| tree | fec2e46338a817231d5bb1e15abc8f36070867df | |
| parent | f1653ac7d5908d4aa7b0f611402f3c4e05a55542 (diff) | |
| download | extra-cmake-modules-616b0b0e3e8e0c001aa151a7babe1463f6c0a541.tar.gz extra-cmake-modules-616b0b0e3e8e0c001aa151a7babe1463f6c0a541.tar.bz2 | |
When strigi is >= 0.6.0, use signed char instead of char.
Strong suggestion for the future: KEEPING SOURCE COMPATIBILITY!
svn path=/branches/KDE/4.1/kdelibs/; revision=860423
| -rw-r--r-- | modules/FindStrigi.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index 83ac283f..094be9b9 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -85,6 +85,7 @@ if (NOT WIN32 AND NOT HAVE_STRIGI_VERSION) # if pkgconfig found strigi, check the version, otherwise print a warning if(_dummyLinkFlags) + ## TODO find out why --max-version does not work! exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${STRIGI_MIN_VERSION} --max-version=${STRIGI_MAX_VERSION} libstreamanalyzer RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) @@ -93,6 +94,11 @@ if (NOT WIN32 AND NOT HAVE_STRIGI_VERSION) message(FATAL_ERROR "Didn't find strigi >= ${STRIGI_MIN_VERSION}") else(NOT _return_VALUE STREQUAL "0") set(HAVE_STRIGI_VERSION TRUE) + set (STRIGI_NEEDS_SIGNED_CHAR FALSE) + exec_program(${PKGCONFIG_EXECUTABLE} ARGS --modversion libstreamanalyzer RETURN_VALUE _version_return_VALUE OUTPUT_VARIABLE _strigiVersion ) + MACRO_ENSURE_VERSION("0.6.0" ${_strigiVersion} STRIGI_NEEDS_SIGNED_CHAR) + # message(STATUS "Strigi version is ${_strigiVersion}. Needs signed char: ${STRIGI_NEEDS_SIGNED_CHAR}") + if(NOT Strigi_FIND_QUIETLY) message(STATUS "Found Strigi >= ${STRIGI_MIN_VERSION}") endif(NOT Strigi_FIND_QUIETLY) |