diff options
| author | David Faure <faure@kde.org> | 2008-07-11 10:33:24 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2008-07-11 10:33:24 +0000 |
| commit | 93e82c9bc1fbe7eefdd80e3c2754ac9c0e0167db (patch) | |
| tree | c5a8977a1166c48d6bde991f4db4fc27379a253e /modules | |
| parent | 786bddac098895df0de680edf2f85a4627009a71 (diff) | |
| download | extra-cmake-modules-93e82c9bc1fbe7eefdd80e3c2754ac9c0e0167db.tar.gz extra-cmake-modules-93e82c9bc1fbe7eefdd80e3c2754ac9c0e0167db.tar.bz2 | |
Fix compilation of kdegraphics with exiv2-0.12 installed on the computer.
The code uses AccessMode which was added in 0.13, so at least for kdegraphics, the min version for a usable exiv2 is 0.13.
CCMAIL: caulier.gilles@gmail.com
svn path=/branches/KDE/4.1/kdelibs/; revision=830862
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindExiv2.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index 884be4ed..5555c92e 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -17,17 +17,21 @@ else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls INCLUDE(UsePkgConfig) + + if(NOT EXIV2_MIN_VERSION) + set(EXIV2_MIN_VERSION "0.12") + endif(NOT EXIV2_MIN_VERSION) PKGCONFIG(exiv2 _EXIV2IncDir _EXIV2LinkDir _EXIV2LinkFlags _EXIV2Cflags) if(_EXIV2LinkFlags) # query pkg-config asking for a Exiv2 >= 0.12 - EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.12 exiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) + EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${EXIV2_MIN_VERSION} exiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) if(_return_VALUE STREQUAL "0") - message(STATUS "Found Exiv2 release >= 0.12") + message(STATUS "Found Exiv2 release >= ${EXIV2_MIN_VERSION}") set(EXIV2_VERSION_GOOD_FOUND TRUE) else(_return_VALUE STREQUAL "0") - message(STATUS "Found Exiv2 release < 0.12") + message(STATUS "Found Exiv2 release < ${EXIV2_MIN_VERSION}") endif(_return_VALUE STREQUAL "0") else(_EXIV2LinkFlags) set(EXIV2_FOUND FALSE) @@ -54,6 +58,7 @@ else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) set(EXIV2_FOUND TRUE) + # TODO version check is missing endif (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) endif(EXIV2_VERSION_GOOD_FOUND) if (EXIV2_FOUND) |