[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE
From:       David Faure <faure () kde ! org>
Date:       2008-07-11 10:50:51
Message-ID: 1215773451.733931.5412.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 830871 by dfaure:

Forwardport 830862, kexiv2 requires exiv2 >= 0.13 for AccessMode.


 M  +1 -0      kdegraphics/CMakeLists.txt  
 M  +8 -3      kdelibs/cmake/modules/FindExiv2.cmake  


--- trunk/KDE/kdegraphics/CMakeLists.txt #830870:830871
@@ -24,6 +24,7 @@
 #X11_xf86vmode discovery is done by FindX11
 macro_log_feature(X11_xf86vmode_FOUND "X11 Video Mode Extension" "An X11 extension \
providing access to detailed timings of video modes currently in use, and a means to \
modify them" "http://www.x.org" FALSE "" "X11 xvidmode extensions are needed to build \
kgamma.")  
+set(EXIV2_MIN_VERSION "0.13") # AccessMode was added in 0.13
 macro_optional_find_package(Exiv2)
 macro_log_feature(EXIV2_FOUND "Exiv2" "A library to access image metadata" \
"http://www.exiv2.org" FALSE "" "Required to build libkexiv2 and gwenview.")  
--- trunk/KDE/kdelibs/cmake/modules/FindExiv2.cmake #830870:830871
@@ -17,17 +17,21 @@
   # 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 @@
   
      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)


[prev in list] [next in list] [prev in thread] [next in thread]