From de0eb9f8ee0b1862405f4e84c8d571b18cac32e2 Mon Sep 17 00:00:00 2001
From: Allen Winter <winter@kde.org>
Date: Wed, 9 Jul 2008 20:12:36 +0000
Subject: 4.1 -> 4.2

svn path=/trunk/KDE/kdelibs/; revision=830131
---
 modules/FindKDE4Internal.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake
index 83213217..e873d0ee 100644
--- a/modules/FindKDE4Internal.cmake
+++ b/modules/FindKDE4Internal.cmake
@@ -1046,13 +1046,13 @@ macro (KDE4_PRINT_RESULTS)
    # inside kdelibs the include dir and lib dir are internal, not "found"
    if (NOT _kdeBootStrapping)
        if(KDE4_INCLUDE_DIR)
-          message(STATUS "Found KDE 4.1 include dir: ${KDE4_INCLUDE_DIR}")
+          message(STATUS "Found KDE 4.2 include dir: ${KDE4_INCLUDE_DIR}")
        else(KDE4_INCLUDE_DIR)
           message(STATUS "ERROR: unable to find KDE 4 headers")
        endif(KDE4_INCLUDE_DIR)
 
        if(KDE4_LIB_DIR)
-          message(STATUS "Found KDE 4.1 library dir: ${KDE4_LIB_DIR}")
+          message(STATUS "Found KDE 4.2 library dir: ${KDE4_LIB_DIR}")
        else(KDE4_LIB_DIR)
           message(STATUS "ERROR: unable to find KDE 4 core library")
        endif(KDE4_LIB_DIR)
-- 
cgit v1.2.1


From 09583bb25791fc4dc0db770b3700f21e18f7d018 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Fri, 11 Jul 2008 10:50:51 +0000
Subject: Forwardport 830862, kexiv2 requires exiv2 >= 0.13 for AccessMode.

svn path=/trunk/KDE/kdelibs/; revision=830871
---
 modules/FindExiv2.cmake | 11 ++++++++---
 1 file 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)
-- 
cgit v1.2.1