From 044ccedb3df4f40ae1d8d7488d4dbc3b0c09484f Mon Sep 17 00:00:00 2001
From: Helio Castro <helio@kde.org>
Date: Tue, 11 Nov 2008 20:25:04 +0000
Subject: - Made changes requested by Alex

svn path=/trunk/KDE/kdelibs/; revision=882988
---
 modules/FindKexiv2.cmake | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

(limited to 'modules/FindKexiv2.cmake')

diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake
index f96631a7..739f187d 100644
--- a/modules/FindKexiv2.cmake
+++ b/modules/FindKexiv2.cmake
@@ -1,23 +1,41 @@
-# - Try to find the Kexiv2 library using cmake pkg_check_modules
+# - Try to find the Kexiv2 library using cmake pkg_check_modulesi otherwise fallback to standard search
+# Once done this will define:
+#
+#  KEXIV2_FOUND - system has libkexiv2
+#  KEXIV2_INCLUDEDIR - the libkexiv2 include directory
+#  KEXIV2_LIBRARIES - Link these to use libkexiv2
+#  KEXIV2_DEFINITIONS - Compiler switches required for using libkexiv2
+
 
 if (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES)
     # in cache already
     SET(KEXIV2_FOUND TRUE)
 else (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES)
     if(NOT WIN32)
-        find_package(PkgConfig REQUIRED)
-        if (Kexiv2_FIND_REQUIRED)
-            pkg_check_modules(KEXIV2 REQUIRED libkexiv2>=0.2.0)
-        else (Kexiv2_FIND_REQUIRED)
+        find_package(PkgConfig)
+        if(PKG_CONFIG_EXECUTABLE)
             pkg_check_modules(KEXIV2 libkexiv2>=0.2.0)
-        endif (Kexiv2_FIND_REQUIRED)
-    else(NOT WIN32)
-        set(KEXIV2_FOUND TRUE)
+        endif(PKG_CONFIG_EXECUTABLE)
     endif(NOT WIN32)
+
+    if(NOT KEXIV2_FOUND)
+        find_path(KEXIV2_INCLUDEDIR libkexiv2/version.h)
+        find_library(KEXIV2_LIBRARIES NAMES kexiv2)
+        if (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES)
+            set(KEXIV2_FOUND TRUE)
+        endif (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES)
+    endif(NOT KEXIV2_FOUND)
+    
     if(KEXIV2_FOUND)
         set(KEXIV2_DEFINITIONS ${KEXIV2_CFLAGS})
         if (NOT Kexiv2_FIND_QUIETLY)
             message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}")
         endif (NOT Kexiv2_FIND_QUIETLY)
+        set(KEXIV2_INCLUDE_DIR ${KEXIV2_INCLUDEDIR})
+        mark_as_advanced( KEXIV2_INCLUDE_DIR )
+    else(KEXIV2_FOUND)
+        if (Kexiv2_FIND_REQUIRED)
+            message(FATAL_ERROR "Not found required libkexiv2")
+        endif (Kexiv2_FIND_REQUIRED)
     endif (KEXIV2_FOUND)
 endif (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES)
-- 
cgit v1.2.1