Embracing new cmake, another module moving to pkg_check_modules

svn path=/trunk/KDE/kdelibs/; revision=882917

3 files changed, 61 insertions, 295 deletions

diff --git a/modules/FindKdcraw.cmake b/modules/FindKdcraw.cmake
index f3b33bf8..4e265ce6 100644
--- a/modules/FindKdcraw.cmake
+++ b/modules/FindKdcraw.cmake
@@ -1,104 +1,23 @@
-# - Try to find the Kdcraw library
-# Once done this will define
-#
-#  KDCRAW_FOUND - system has libkdcraw
-#  KDCRAW_INCLUDE_DIR - the libkdcraw include directory
-#  KDCRAW_LIBRARIES - Link these to use libkdcraw
-#  KDCRAW_DEFINITIONS - Compiler switches required for using libkdcraw
-#
+# - Try to find the Kdcraw library using cmake pkg_check_modules
 
-if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
-
-  message(STATUS "Found Kdcraw library in cache: ${KDCRAW_LIBRARIES}")
-
-  # in cache already
-  SET(KDCRAW_FOUND TRUE)
-
-else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
-
-  message(STATUS "Check Kdcraw library in local sub-folder...")
-
-  # Check if library is not in local sub-folder
- 
-  FIND_FILE(KDCRAW_LOCAL_FOUND libkdcraw/version.h ${CMAKE_BINARY_DIR}/libkdcraw ${CMAKE_BINARY_DIR}/libs/libkdcraw NO_DEFAULT_PATH)
-
-  if (KDCRAW_LOCAL_FOUND)
-
-    # Was it found in libkdcraw/ or in libs/libkdcraw?
-    FIND_FILE(KDCRAW_LOCAL_FOUND_IN_LIBS libkdcraw/version.h ${CMAKE_BINARY_DIR}/libs/libkdcraw NO_DEFAULT_PATH)
-    if (KDCRAW_LOCAL_FOUND_IN_LIBS)
-      set(KDCRAW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libs/libkdcraw)
-    else (KDCRAW_LOCAL_FOUND_IN_LIBS)
-      set(KDCRAW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkdcraw)
-    endif (KDCRAW_LOCAL_FOUND_IN_LIBS)
-    set(KDCRAW_DEFINITIONS "-I${KDCRAW_INCLUDE_DIR}")
-    set(KDCRAW_LIBRARIES kdcraw)
-    message(STATUS "Found Kdcraw library in local sub-folder: ${KDCRAW_INCLUDE_DIR}")
-    set(KDCRAW_FOUND TRUE)
-    MARK_AS_ADVANCED(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES)
-
-  else(KDCRAW_LOCAL_FOUND)
-
-    message(STATUS "Check Kdcraw library using pkg-config...")
+if (KDCRAW_INCLUDEDIR AND KDCRAW_LIBRARIES)
+    # in cache already
+    SET(KDCRAW_FOUND TRUE)
+else (KDCRAW_INCLUDEDIR AND KDCRAW_LIBRARIES)
     if(NOT WIN32)
-      # use pkg-config to get the directories and then use these values
-      # in the FIND_PATH() and FIND_LIBRARY() calls
-      INCLUDE(UsePkgConfig)
-    
-      PKGCONFIG(libkdcraw _KDCRAWIncDir _KDCRAWLinkDir _KDCRAWLinkFlags _KDCRAWCflags)
-    
-      if(_KDCRAWLinkFlags)
-        # query pkg-config asking for a libkdcraw >= 0.2.0
-        EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkdcraw RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
-        if(_return_VALUE STREQUAL "0")
-            message(STATUS "Found libkdcraw release >= 0.2.0")
-            set(KDCRAW_VERSION_GOOD_FOUND TRUE)
-        else(_return_VALUE STREQUAL "0")
-            message(STATUS "Found libkdcaw release < 0.2.0, too old")
-            set(KDCRAW_VERSION_GOOD_FOUND FALSE)
-            set(KDCRAW_FOUND FALSE)
-        endif(_return_VALUE STREQUAL "0")
-      else(_KDCRAWLinkFlags)
-        set(KDCRAW_VERSION_GOOD_FOUND FALSE)
-        set(KDCRAW_FOUND FALSE)
-      endif(_KDCRAWLinkFlags)
-    ELSE(NOT WIN32)
-      set(KDCRAW_VERSION_GOOD_FOUND TRUE)
-    ENDif(NOT WIN32)
-
-    if(KDCRAW_VERSION_GOOD_FOUND)
-        set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}")
-    
-        FIND_PATH(KDCRAW_INCLUDE_DIR libkdcraw/version.h
-        ${_KDCRAWIncDir}
-        )
-    
-        FIND_LIBRARY(KDCRAW_LIBRARIES NAMES kdcraw
-        PATHS
-        ${_KDCRAWLinkDir}
-        )
-    
-        if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
-            set(KDCRAW_FOUND TRUE)
-        endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
-     endif(KDCRAW_VERSION_GOOD_FOUND) 
-     if (KDCRAW_FOUND)
-         if (NOT Kdcraw_FIND_QUIETLY)
-             message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}")
-         endif (NOT Kdcraw_FIND_QUIETLY)
-     else (KDCRAW_FOUND)
-         if (Kdcraw_FIND_REQUIRED)
-             if (NOT KDCRAW_INCLUDE_DIR)
-                 message(FATAL_ERROR "Could NOT find libkdcraw header files")
-             endif (NOT KDCRAW_INCLUDE_DIR)
-             if (NOT KDCRAW_LIBRARIES)
-                 message(FATAL_ERROR "Could NOT find libkdcraw library")
-             endif (NOT KDCRAW_LIBRARIES)
-         endif (Kdcraw_FIND_REQUIRED)
-     endif (KDCRAW_FOUND)
-    
-    MARK_AS_ADVANCED(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES)
-
-  endif(KDCRAW_LOCAL_FOUND)
-  
-endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
+        find_package(PkgConfig REQUIRED)
+        if (Kdcraw_FIND_REQUIRED)
+            pkg_check_modules(KDCRAW REQUIRED libkdcraw>=0.2.0)
+        else (Kdcraw_FIND_REQUIRED)
+            pkg_check_modules(KDCRAW libkdcraw>=0.2.0)
+        endif (Kdcraw_FIND_REQUIRED)
+    else(NOT WIN32)
+        set(KDCRAW_FOUND TRUE)
+    endif(NOT WIN32)
+    if(KDCRAW_FOUND)
+        set(KDCRAW_DEFINITIONS ${KDCRAW_CFLAGS})
+        if (NOT Kdcraw_FIND_QUIETLY)
+            message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}")
+        endif (NOT Kdcraw_FIND_QUIETLY)
+    endif (KDCRAW_FOUND)
+endif (KDCRAW_INCLUDEDIR AND KDCRAW_LIBRARIES)
diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake
index c57ed1c2..f96631a7 100644
--- a/modules/FindKexiv2.cmake
+++ b/modules/FindKexiv2.cmake
@@ -1,103 +1,23 @@
-# - Try to find the KExiv2 library
-# Once done this will define
-#
-#  KEXIV2_FOUND - system has libkexiv2
-#  KEXIV2_INCLUDE_DIR - the libkexiv2 include directory
-#  KEXIV2_LIBRARIES - Link these to use libkexiv2
-#  KEXIV2_DEFINITIONS - Compiler switches required for using libkexiv2
-#
-
-if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
-
-  message(STATUS "Found Kexiv2 library in cache: ${KEXIV2_LIBRARIES}")
-
-  # in cache already
-  SET(KEXIV2_FOUND TRUE)
-
-else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
-
-  message(STATUS "Check Kexiv2 library in local sub-folder...")
-
-  # Check if library is not in local sub-folder
-
-  FIND_FILE(KEXIV2_LOCAL_FOUND libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libkexiv2 ${CMAKE_SOURCE_DIR}/libs/libkexiv2 NO_DEFAULT_PATH)
-
-  if (KEXIV2_LOCAL_FOUND)
-
-    FIND_FILE(KEXIV2_LOCAL_FOUND_IN_LIBS libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libs/libkexiv2 NO_DEFAULT_PATH)
-    if (KEXIV2_LOCAL_FOUND_IN_LIBS)
-      set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libs/libkexiv2)
-    else (KEXIV2_LOCAL_FOUND_IN_LIBS)
-      set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkexiv2)
-    endif (KEXIV2_LOCAL_FOUND_IN_LIBS)
-    set(KEXIV2_DEFINITIONS "-I${KEXIV2_INCLUDE_DIR}")
-    set(KEXIV2_LIBRARIES kexiv2)
-    message(STATUS "Found Kexiv2 library in local sub-folder: ${KEXIV2_INCLUDE_DIR}")
-    set(KEXIV2_FOUND TRUE)
-    MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES)
-
-  else(KEXIV2_LOCAL_FOUND)
-    if(NOT WIN32) 
-      message(STATUS "Check Kexiv2 library using pkg-config...")
-
-      # use pkg-config to get the directories and then use these values
-      # in the FIND_PATH() and FIND_LIBRARY() calls
-      INCLUDE(UsePkgConfig)
-    
-      PKGCONFIG(libkexiv2 _KEXIV2IncDir _KEXIV2LinkDir _KEXIV2LinkFlags _KEXIV2Cflags)
-    
-      if(_KEXIV2LinkFlags)
-        # query pkg-config asking for a libkexiv2 >= 0.2.0
-        EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkexiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
-        if(_return_VALUE STREQUAL "0")
-            message(STATUS "Found libkexiv2 release >= 0.2.0")
-            set(KEXIV2_VERSION_GOOD_FOUND TRUE)
-        else(_return_VALUE STREQUAL "0")
-            message(STATUS "Found libkexiv2 release < 0.2.0, too old")
-            set(KEXIV2_VERSION_GOOD_FOUND FALSE)
-            set(KEXIV2_FOUND FALSE)
-        endif(_return_VALUE STREQUAL "0")
-      else(_KEXIV2LinkFlags)
-        set(KEXIV2_VERSION_GOOD_FOUND FALSE)
-        set(KEXIV2_FOUND FALSE)
-      endif(_KEXIV2LinkFlags)
+# - Try to find the Kexiv2 library using cmake pkg_check_modules
+
+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)
+            pkg_check_modules(KEXIV2 libkexiv2>=0.2.0)
+        endif (Kexiv2_FIND_REQUIRED)
     else(NOT WIN32)
-      set(KEXIV2_VERSION_GOOD_FOUND TRUE)
+        set(KEXIV2_FOUND TRUE)
     endif(NOT WIN32)
-
-    if(KEXIV2_VERSION_GOOD_FOUND)
-        set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}")
-    
-        FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h
-        ${_KEXIV2IncDir}
-        )
-    
-        FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2
-        PATHS
-        ${_KEXIV2LinkDir}
-        )
-    
-        if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
-            set(KEXIV2_FOUND TRUE)
-        endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
-      endif(KEXIV2_VERSION_GOOD_FOUND) 
-      if (KEXIV2_FOUND)
-          if (NOT Kexiv2_FIND_QUIETLY)
-              message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}")
-          endif (NOT Kexiv2_FIND_QUIETLY)
-      else (KEXIV2_FOUND)
-          if (Kexiv2_FIND_REQUIRED)
-              if (NOT KEXIV2_INCLUDE_DIR)
-                  message(FATAL_ERROR "Could NOT find libkexiv2 header files")
-              endif (NOT KEXIV2_INCLUDE_DIR)
-              if (NOT KEXIV2_LIBRARIES)
-                  message(FATAL_ERROR "Could NOT find libkexiv2 library")
-              endif (NOT KEXIV2_LIBRARIES)
-          endif (Kexiv2_FIND_REQUIRED)
-      endif (KEXIV2_FOUND)
-    
-    MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES)
-
-  endif(KEXIV2_LOCAL_FOUND)
-  
-endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
+    if(KEXIV2_FOUND)
+        set(KEXIV2_DEFINITIONS ${KEXIV2_CFLAGS})
+        if (NOT Kexiv2_FIND_QUIETLY)
+            message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}")
+        endif (NOT Kexiv2_FIND_QUIETLY)
+    endif (KEXIV2_FOUND)
+endif (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES)
diff --git a/modules/FindKipi.cmake b/modules/FindKipi.cmake
index de0d046b..83463fb7 100644
--- a/modules/FindKipi.cmake
+++ b/modules/FindKipi.cmake
@@ -1,97 +1,24 @@
-# - Try to find the Kipi library
+# - Try to find the Kipi library using cmake pkg_check_modules
 # Once done this will define
-#
-#  KIPI_FOUND - system has libkipi
-#  KIPI_INCLUDE_DIR - the libkipi include directory
-#  KIPI_LIBRARIES - Link these to use libkipi
-#  KIPI_DEFINITIONS - Compiler switches required for using libkipi
-#
-
-if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
-
-  message(STATUS "Found Kipi library in cache: ${KIPI_LIBRARIES}")
-
-  # in cache already
-  SET(KIPI_FOUND TRUE)
-
-else (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
-
-  message(STATUS "Check Kipi library in local sub-folder...")
-
-  # Check if library is not in local sub-folder
-
-  find_file (KIPI_LOCAL_FOUND libkipi/version.h.cmake ${CMAKE_SOURCE_DIR}/libkipi ${CMAKE_SOURCE_DIR}/libs/libkipi NO_DEFAULT_PATH)
-
-  if (KIPI_LOCAL_FOUND)
-
-    find_file (KIPI_LOCAL_FOUND_IN_LIBS libkipi/version.h.cmake ${CMAKE_SOURCE_DIR}/libs/libkipi NO_DEFAULT_PATH)
-    if (KIPI_LOCAL_FOUND_IN_LIBS)
-      set(KIPI_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libs/libkipi)
-    else (KIPI_LOCAL_FOUND_IN_LIBS)
-      set(KIPI_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkipi)
-    endif (KIPI_LOCAL_FOUND_IN_LIBS)
-    set(KIPI_DEFINITIONS -I${KIPI_INCLUDE_DIR})
-    set(KIPI_LIBRARIES kipi)
-    message(STATUS "Found Kipi library in local sub-folder: ${KIPI_INCLUDE_DIR}")
-    set(KIPI_FOUND TRUE)
-    mark_as_advanced(KIPI_INCLUDE_DIR KIPI_LIBRARIES)
-
-  else(KIPI_LOCAL_FOUND)
 
+if (KIPI_INCLUDEDIR AND KIPI_LIBRARIES)
+    # in cache already
+    SET(KIPI_FOUND TRUE)
+else (KIPI_INCLUDEDIR AND KIPI_LIBRARIES)
     if(NOT WIN32)
-      message(STATUS "Check Kipi library using pkg-config...")
-
-      # use pkg-config to get the directories and then use these values
-      # in the FIND_PATH() and FIND_LIBRARY() calls
-      INCLUDE(UsePkgConfig)
-
-      PKGCONFIG(libkipi _KIPIIncDir _KIPILinkDir _KIPILinkFlags _KIPICflags)
-
-      if(_KIPILinkFlags)
-        # query pkg-config asking for a libkipi >= 0.2.0
-        exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkipi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
-        if(_return_VALUE STREQUAL "0")
-            message(STATUS "Found libkipi release >= 0.2.0")
-            set(KIPI_VERSION_GOOD_FOUND TRUE)
-        else(_return_VALUE STREQUAL "0")
-            message(STATUS "Found libkipi release < 0.2.0, too old")
-            set(KIPI_VERSION_GOOD_FOUND FALSE)
-            set(KIPI_FOUND FALSE)
-        endif(_return_VALUE STREQUAL "0")
-      else(_KIPILinkFlags)
-        set(KIPI_VERSION_GOOD_FOUND FALSE)
-        set(KIPI_FOUND FALSE)
-      endif(_KIPILinkFlags)
+        find_package(PkgConfig REQUIRED)
+        if (Kipi_FIND_REQUIRED)
+            pkg_check_modules(KIPI REQUIRED libkipi>=0.2.0)
+        else (Kipi_FIND_REQUIRED)
+            pkg_check_modules(KIPI libkipi>=0.2.0)
+        endif (Kipi_FIND_REQUIRED)
     else(NOT WIN32)
-      set(KIPI_VERSION_GOOD_FOUND TRUE)
+        set(KIPI_FOUND TRUE)
     endif(NOT WIN32)
-    if(KIPI_VERSION_GOOD_FOUND)
-        set(KIPI_DEFINITIONS ${_KIPICflags})
-
-        find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KDE4_INCLUDE_DIR} ${_KIPIIncDir})
-        find_library(KIPI_LIBRARIES NAMES kipi PATHS ${KDE4_LIB_DIR} ${_KIPILinkDir})
-
-        if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
-            set(KIPI_FOUND TRUE)
-        endif (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
-      endif(KIPI_VERSION_GOOD_FOUND)
-      if (KIPI_FOUND)
-          if (NOT Kipi_FIND_QUIETLY)
-              message(STATUS "Found libkipi: ${KIPI_LIBRARIES}")
-          endif (NOT Kipi_FIND_QUIETLY)
-      else (KIPI_FOUND)
-          if (Kipi_FIND_REQUIRED)
-              if (NOT KIPI_INCLUDE_DIR)
-                  message(FATAL_ERROR "Could NOT find libkipi header files")
-              endif (NOT KIPI_INCLUDE_DIR)
-              if (NOT KIPI_LIBRARIES)
-                  message(FATAL_ERROR "Could NOT find libkipi library")
-              endif (NOT KIPI_LIBRARIES)
-          endif (Kipi_FIND_REQUIRED)
-      endif (KIPI_FOUND)
-    
-    MARK_AS_ADVANCED(KIPI_INCLUDE_DIR KIPI_LIBRARIES)
-
-  endif(KIPI_LOCAL_FOUND)
-  
-endif (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
+    if(KIPI_FOUND)
+        set(KIPI_DEFINITIONS ${KIPI_CFLAGS})
+        if (NOT Kipi_FIND_QUIETLY)
+            message(STATUS "Found libkipi: ${KIPI_LIBRARIES}")
+        endif (NOT Kipi_FIND_QUIETLY)
+    endif (KIPI_FOUND)
+endif (KIPI_INCLUDEDIR AND KIPI_LIBRARIES)