FindPCRE.cmake: lowercasing

FindSharedMimeInfo.cmake: document SHARED_MIME_INFO_MINIMUM_VERSION and add a comment about the WORKING_DIRECTORY
FindGStreamer.cmake: use FIND_PACKAGE_HANDLE_STANDARD_ARGS()
FindExiv2.cmake: lowercasing, document EXIV2_MIN_VERSION
FindKDE4Internal.cmake: remove empty lines from documentation block so everything is included again in the generated documentation

Alex



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

6 files changed, 56 insertions, 59 deletions

diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake
index 5555c92e..5bef48be 100644
--- a/modules/FindExiv2.cmake
+++ b/modules/FindExiv2.cmake
@@ -1,4 +1,8 @@
 # - Try to find the Exiv2 library
+#
+#  EXIV2_MIN_VERSION - You can set this variable to the minimum version you need 
+#                      before doing FIND_PACKAGE(Exiv2). The default is 0.12.
+# 
 # Once done this will define
 #
 #  EXIV2_FOUND - system has libexiv2
@@ -10,23 +14,23 @@
 if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES)
 
   # in cache already
-  SET(EXIV2_FOUND TRUE)
+  set(EXIV2_FOUND TRUE)
 
 else (EXIV2_INCLUDE_DIR AND EXIV2_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)
+  include(UsePkgConfig)
 
   if(NOT EXIV2_MIN_VERSION)
     set(EXIV2_MIN_VERSION "0.12")
   endif(NOT EXIV2_MIN_VERSION)
   
-  PKGCONFIG(exiv2 _EXIV2IncDir _EXIV2LinkDir _EXIV2LinkFlags _EXIV2Cflags)
+  pkgconfig(exiv2 _EXIV2IncDir _EXIV2LinkDir _EXIV2LinkFlags _EXIV2Cflags)
 
   if(_EXIV2LinkFlags)
     # query pkg-config asking for a Exiv2 >= 0.12
-    EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${EXIV2_MIN_VERSION} 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 >= ${EXIV2_MIN_VERSION}")
       set(EXIV2_VERSION_GOOD_FOUND TRUE)
@@ -47,11 +51,11 @@ else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES)
   if(EXIV2_VERSION_GOOD_FOUND)
      set(EXIV2_DEFINITIONS ${_EXIV2Cflags})
  
-     FIND_PATH(EXIV2_INCLUDE_DIR exiv2/exif.hpp
+     find_path(EXIV2_INCLUDE_DIR exiv2/exif.hpp
        ${_EXIV2IncDir}
      )
   
-     FIND_LIBRARY(EXIV2_LIBRARIES NAMES exiv2 libexiv2
+     find_library(EXIV2_LIBRARIES NAMES exiv2 libexiv2
        PATHS
        ${_EXIV2LinkDir}
      )
@@ -76,7 +80,7 @@ else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES)
      endif (Exiv2_FIND_REQUIRED)
    endif (EXIV2_FOUND)
 
-  MARK_AS_ADVANCED(EXIV2_INCLUDE_DIR EXIV2_LIBRARIES)
+  mark_as_advanced(EXIV2_INCLUDE_DIR EXIV2_LIBRARIES)
   
 endif (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES)
 
diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake
index 45e4e0e1..0951c675 100644
--- a/modules/FindGSSAPI.cmake
+++ b/modules/FindGSSAPI.cmake
@@ -32,34 +32,34 @@ else(GSSAPI_LIBS AND GSSAPI_FLAVOR)
   
   if(KRB5_CONFIG)
   
-    SET(HAVE_KRB5_GSSAPI TRUE)
-    EXEC_PROGRAM(${KRB5_CONFIG} ARGS --libs gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_LIBS)
-    IF(_return_VALUE)
-      MESSAGE(STATUS "GSSAPI configure check failed.")
-      SET(HAVE_KRB5_GSSAPI FALSE)
-    ENDIF(_return_VALUE)
+    set(HAVE_KRB5_GSSAPI TRUE)
+    exec_program(${KRB5_CONFIG} ARGS --libs gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_LIBS)
+    if(_return_VALUE)
+      message(STATUS "GSSAPI configure check failed.")
+      set(HAVE_KRB5_GSSAPI FALSE)
+    endif(_return_VALUE)
   
-    EXEC_PROGRAM(${KRB5_CONFIG} ARGS --cflags gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_INCS)
+    exec_program(${KRB5_CONFIG} ARGS --cflags gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_INCS)
     string(REGEX REPLACE "(\r?\n)+$" "" GSSAPI_INCS "${GSSAPI_INCS}")
     string(REGEX REPLACE " *-I" ";" GSSAPI_INCS "${GSSAPI_INCS}")
 
-    EXEC_PROGRAM(${KRB5_CONFIG} ARGS --vendor RETURN_VALUE _return_VALUE OUTPUT_VARIABLE gssapi_flavor_tmp)
+    exec_program(${KRB5_CONFIG} ARGS --vendor RETURN_VALUE _return_VALUE OUTPUT_VARIABLE gssapi_flavor_tmp)
     set(GSSAPI_FLAVOR_MIT)
-    IF(gssapi_flavor_tmp MATCHES ".*Massachusetts.*")
-      SET(GSSAPI_FLAVOR "MIT")
-    ELSE(gssapi_flavor_tmp MATCHES ".*Massachusetts.*")
-      SET(GSSAPI_FLAVOR "HEIMDAL")
-    ENDIF(gssapi_flavor_tmp MATCHES ".*Massachusetts.*")
+    if(gssapi_flavor_tmp MATCHES ".*Massachusetts.*")
+      set(GSSAPI_FLAVOR "MIT")
+    else(gssapi_flavor_tmp MATCHES ".*Massachusetts.*")
+      set(GSSAPI_FLAVOR "HEIMDAL")
+    endif(gssapi_flavor_tmp MATCHES ".*Massachusetts.*")
   
-    IF(NOT HAVE_KRB5_GSSAPI)
-      IF (gssapi_flavor_tmp MATCHES "Sun Microsystems.*")
-         MESSAGE(STATUS "Solaris Kerberos does not have GSSAPI; this is normal.")
-         SET(GSSAPI_LIBS)
-         SET(GSSAPI_INCS)
-      ELSE(gssapi_flavor_tmp MATCHES "Sun Microsystems.*")
-         MESSAGE(WARNING "${KRB5_CONFIG} failed unexpectedly.")
-      ENDIF(gssapi_flavor_tmp MATCHES "Sun Microsystems.*")
-    ENDIF(NOT HAVE_KRB5_GSSAPI)
+    if(NOT HAVE_KRB5_GSSAPI)
+      if (gssapi_flavor_tmp MATCHES "Sun Microsystems.*")
+         message(STATUS "Solaris Kerberos does not have GSSAPI; this is normal.")
+         set(GSSAPI_LIBS)
+         set(GSSAPI_INCS)
+      else(gssapi_flavor_tmp MATCHES "Sun Microsystems.*")
+         message(WARNING "${KRB5_CONFIG} failed unexpectedly.")
+      endif(gssapi_flavor_tmp MATCHES "Sun Microsystems.*")
+    endif(NOT HAVE_KRB5_GSSAPI)
 
     if(GSSAPI_LIBS) # GSSAPI_INCS can be also empty, so don't rely on that
       set(GSSAPI_FOUND TRUE)
diff --git a/modules/FindGStreamer.cmake b/modules/FindGStreamer.cmake
index f75e92d9..5a94452b 100644
--- a/modules/FindGStreamer.cmake
+++ b/modules/FindGStreamer.cmake
@@ -68,20 +68,7 @@ ELSE (GSTREAMER_INTERFACE_LIBRARY)
    MESSAGE(STATUS "GStreamer: WARNING: interface library not found")
 ENDIF (GSTREAMER_INTERFACE_LIBRARY)
 
-IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
-   SET(GSTREAMER_FOUND TRUE)
-ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
-   SET(GSTREAMER_FOUND FALSE)
-ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
-
-IF (GSTREAMER_FOUND)
-   IF (NOT GStreamer_FIND_QUIETLY)
-      MESSAGE(STATUS "Found GStreamer: ${GSTREAMER_LIBRARIES}")
-   ENDIF (NOT GStreamer_FIND_QUIETLY)
-ELSE (GSTREAMER_FOUND)
-   IF (GStreamer_FIND_REQUIRED)
-      MESSAGE(SEND_ERROR "Could NOT find GStreamer")
-   ENDIF (GStreamer_FIND_REQUIRED)
-ENDIF (GSTREAMER_FOUND)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer  DEFAULT_MSG  GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY)
 
 MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY)
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake
index 486b3fe0..ee0100eb 100644
--- a/modules/FindKDE4Internal.cmake
+++ b/modules/FindKDE4Internal.cmake
@@ -194,12 +194,9 @@
 #   The resulting manpage will be installed to <installdest> when using
 #   INSTALL_DESTINATION <installdest>, or to <installdest>/<subdir> if
 #   SUBDIR <subdir> is specified.
-
-
-#  _KDE4_PLATFORM_INCLUDE_DIRS is used only internally
-#  _KDE4_PLATFORM_DEFINITIONS is used only internally
-
-#  Note on the possible values for CMAKE_BUILD_TYPE and how KDE handles
+#
+#
+#  A note on the possible values for CMAKE_BUILD_TYPE and how KDE handles
 #  the flags for those buildtypes. FindKDE4Internal supports the values
 #  Debug, Release, Relwithdebinfo, Profile and Debugfull
 #
@@ -220,6 +217,9 @@
 #  It's also important to note that gcc cannot detect all warning conditions
 #  unless the optimiser is active.
 
+#  _KDE4_PLATFORM_INCLUDE_DIRS is used only internally
+#  _KDE4_PLATFORM_DEFINITIONS is used only internally
+
 # Copyright (c) 2006-2008, Alexander Neundorf <neundorf@kde.org>
 # Copyright (c) 2006, Laurent Montel, <montel@kde.org>
 #
@@ -401,6 +401,7 @@ else (_kdeBootStrapping)
 
    find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
    set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} )
+
    find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
    set(KDE4_KJSAPI_LIBS ${kjsapi_LIB_DEPENDS} ${KDE4_KJSAPI_LIBRARY} )
 
diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake
index 56f015a8..ba2de623 100644
--- a/modules/FindPCRE.cmake
+++ b/modules/FindPCRE.cmake
@@ -17,23 +17,23 @@ if (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
 endif (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
 
 
-IF (NOT WIN32)
+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)
+  include(UsePkgConfig)
   
-  PKGCONFIG(libpcre _PCREIncDir _PCRELinkDir _PCRELinkFlags _PCRECflags)
-ENDIF (NOT WIN32)  
+  pkgconfig(libpcre _PCREIncDir _PCRELinkDir _PCRELinkFlags _PCRECflags)
+endif (NOT WIN32)  
 
-FIND_PATH(PCRE_INCLUDE_DIR pcre.h PATHS ${_PCREIncDir} PATH_SUFFIXES pcre)
+find_path(PCRE_INCLUDE_DIR pcre.h PATHS ${_PCREIncDir} PATH_SUFFIXES pcre)
 
-FIND_LIBRARY(PCRE_PCRE_LIBRARY NAMES pcre PATHS ${_PCRELinkDir})
+find_library(PCRE_PCRE_LIBRARY NAMES pcre PATHS ${_PCRELinkDir})
 
-FIND_LIBRARY(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix PATHS ${_PCRELinkDir})
+find_library(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix PATHS ${_PCRELinkDir})
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_PCREPOSIX_LIBRARY )
+find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_PCREPOSIX_LIBRARY )
 
 set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY})
 
-MARK_AS_ADVANCED(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY)
+mark_as_advanced(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY)
diff --git a/modules/FindSharedMimeInfo.cmake b/modules/FindSharedMimeInfo.cmake
index 510c4992..707cb006 100644
--- a/modules/FindSharedMimeInfo.cmake
+++ b/modules/FindSharedMimeInfo.cmake
@@ -1,4 +1,7 @@
 # - Try to find the shared-mime-info package
+#
+#  SHARED_MIME_INFO_MINIMUM_VERSION - Set this to the minimum version you need, default is 0.18
+#
 # Once done this will define
 #
 #  SHARED_MIME_INFO_FOUND - system has the shared-mime-info package
@@ -61,9 +64,11 @@ macro(UPDATE_XDG_MIMETYPES _path)
    else("${_xdgmimeDir}" STREQUAL packages )
       set(_xdgmimeDir "${_path}")
    endif("${_xdgmimeDir}" STREQUAL packages )
+
    install(CODE "
 set(DESTDIR_VALUE \"\$ENV{DESTDIR}\")
 if (NOT DESTDIR_VALUE)
+  # under Windows relative paths are used, that's why it runs from CMAKE_INSTALL_PREFIX
   execute_process(COMMAND ${UPDATE_MIME_DATABASE_EXECUTABLE} ${_xdgmimeDir}
                   WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})
 endif (NOT DESTDIR_VALUE)