move the mimetype update macro to FindSharedMimeInfo.cmake, since it belongs to this stuff and not really to KDE4

Alex

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

3 files changed, 28 insertions, 33 deletions

diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake
index db0daae1..24c0d8d8 100644
--- a/modules/FindKDE4Internal.cmake
+++ b/modules/FindKDE4Internal.cmake
@@ -99,6 +99,7 @@
 # KCONF_UPDATE_INSTALL_DIR - the kconf_update install dir
 # XDG_APPS_DIR             - the XDG apps dir
 # XDG_DIRECTORY_DIR        - the XDG directory
+# XDG_MIME_INSTALL_DIR     - the XDG mimetypes install dir
 # DBUS_INTERFACES_DIR      - the directory where dbus interfaces be installed (default is prefix/share/dbus-1/interfaces)
 # DBUS_SERVICES_DIR        - the directory where dbus services be installed (default is prefix/share/dbus-1/services )
 #
@@ -346,8 +347,9 @@ _set_fancy(KCONF_UPDATE_INSTALL_DIR "${DATA_INSTALL_DIR}/kconf_update"     "The
 _set_fancy(APPLNK_INSTALL_DIR       "${SHARE_INSTALL_PREFIX}/applnk"       "Is this still used ?")
 _set_fancy(AUTOSTART_INSTALL_DIR    "${SHARE_INSTALL_PREFIX}/autostart"    "The install dir for autostart files")
 
-_set_fancy(XDG_APPS_DIR             "${SHARE_INSTALL_PREFIX}/applications/kde4"    "The XDG apps dir")
+_set_fancy(XDG_APPS_DIR             "${SHARE_INSTALL_PREFIX}/applications/kde4"   "The XDG apps dir")
 _set_fancy(XDG_DIRECTORY_DIR        "${SHARE_INSTALL_PREFIX}/desktop-directories" "The XDG directory")
+_set_fancy(XDG_MIME_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/mime/packages" "The install dir for the xdg mimetypes")
 
 _set_fancy(SYSCONF_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/etc"          "The kde sysconfig install dir (default /etc)")
 _set_fancy(MAN_INSTALL_DIR          "${CMAKE_INSTALL_PREFIX}/man"          "The kde man install dir (default ${CMAKE_INSTALL_PREFIX}/man/)")
diff --git a/modules/FindSharedMimeInfo.cmake b/modules/FindSharedMimeInfo.cmake
index 83da92e3..8b10d208 100644
--- a/modules/FindSharedMimeInfo.cmake
+++ b/modules/FindSharedMimeInfo.cmake
@@ -3,7 +3,7 @@
 #
 #  SHARED_MIME_INFO_FOUND - system has the shared-mime-info package
 #  UPDATE_MIME_DATABASE_EXECUTABLE - the update-mime-database executable
-#
+
 # Copyright (c) 2007, Pino Toscano, <toscano.pino@tiscali.it>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
@@ -49,7 +49,19 @@ else (UPDATE_MIME_DATABASE_EXECUTABLE)
         endif (SharedMimeInfo_FIND_REQUIRED)
     endif (SHARED_MIME_INFO_FOUND)
 
-    # ensure that they are cached
-    set(UPDATE_MIME_DATABASE_EXECUTABLE ${UPDATE_MIME_DATABASE_EXECUTABLE} CACHE INTERNAL "The update-mime-database executable")
-
 endif (UPDATE_MIME_DATABASE_EXECUTABLE)
+
+macro(UPDATE_XDG_MIMETYPES _path)
+   get_filename_component(_xdgmimeDir "${_path}" NAME)
+   if("${_xdgmimeDir}" STREQUAL packages )
+      get_filename_component(_xdgmimeDir "${_path}" PATH)
+   else("${_xdgmimeDir}" STREQUAL packages )
+      set(_xdgmimeDir "${_path}")
+   endif("${_xdgmimeDir}" STREQUAL packages )
+   install(CODE "
+set(DESTDIR_VALUE \"\$ENV{DESTDIR}\")
+if (NOT DESTDIR_VALUE)
+  execute_process(COMMAND ${UPDATE_MIME_DATABASE_EXECUTABLE} ${_xdgmimeDir})
+endif (NOT DESTDIR_VALUE)
+")
+endmacro (UPDATE_XDG_MIMETYPES)
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake
index 419205be..492cf8b3 100644
--- a/modules/KDE4Macros.cmake
+++ b/modules/KDE4Macros.cmake
@@ -23,7 +23,6 @@
 # KDE4_INSTALL_HANDBOOK
 # KDE4_CREATE_PO_FILES
 # KDE4_INSTALL_PO_FILES
-# KDE4_INSTALL_XDG_MIMETYPES
 
 # Copyright (c) 2006, 2007, Alexander Neundorf, <neundorf@kde.org>
 # Copyright (c) 2006, 2007, Laurent Montel, <montel@kde.org>
@@ -151,10 +150,6 @@ macro (KDE4_ADD_UI3_FILES _sources )
    endforeach (_current_FILE)
 endmacro (KDE4_ADD_UI3_FILES)
 
-macro (KDE4_AUTOMOC)
-   message(SEND_ERROR "KDE4_AUTOMOC() is not required anymore for automoc, please remove it")
-endmacro (KDE4_AUTOMOC)
-
 macro (KDE4_SET_CUSTOM_TARGET_PROPERTY _target_name _property_name _property)
    string(REPLACE "[/ ]" "_" _dir "${CMAKE_CURRENT_SOURCE_DIR}")
    set(_kde4_${_dir}_${_target_name}_${_property_name} "${_property}")
@@ -420,11 +415,6 @@ macro (KDE4_INSTALL_ICONS _defaultpath )
 endmacro (KDE4_INSTALL_ICONS)
 
 
-MACRO (KDE4_INSTALL_LIBTOOL_FILE)
-   message(SEND_ERROR "KDE4_INSTALL_LIBTOOL_FILE() is deprecated, please remove it")
-ENDMACRO (KDE4_INSTALL_LIBTOOL_FILE)
-
-
 # For all C++ sources a big source file which includes all the files
 # is created.
 # This is not done for the C sources, they are just gathered in a separate list
@@ -863,25 +853,16 @@ macro(KDE4_CREATE_EXPORTS_HEADER _outputFile _libName)
 endmacro(KDE4_CREATE_EXPORTS_HEADER _outputFile _libName)
 
 
-macro (INSTALL_XDG_MIMETYPES _path )
-
-   foreach (_current_FILE ${ARGN})
-
-       install(FILES ${_current_FILE} DESTINATION ${_path}/share/mime/packages)
-
-       install(CODE "
-set(DESTDIR_VALUE \"\$ENV{DESTDIR}\")
-if (NOT DESTDIR_VALUE)
-  exec_program(update-mime-database ARGS ${_path}/share/mime/)
-endif (NOT DESTDIR_VALUE)
-")
-
-   endforeach (_current_FILE)
+macro (KDE4_INSTALL_XDG_MIMETYPES)
+   message(SEND_ERROR "KDE4_INSTALL_XDG_MIMETYPES() is deprecated, see kdelibs/mimetypes/CMakeLists.txt for an example")
+endmacro (KDE4_INSTALL_XDG_MIMETYPES)
 
-endmacro (INSTALL_XDG_MIMETYPES)
+macro (KDE4_AUTOMOC)
+   message(SEND_ERROR "KDE4_AUTOMOC() is not required anymore for automoc, please remove it")
+endmacro (KDE4_AUTOMOC)
 
-macro (KDE4_INSTALL_XDG_MIMETYPES)
+MACRO (KDE4_INSTALL_LIBTOOL_FILE)
+   message(SEND_ERROR "KDE4_INSTALL_LIBTOOL_FILE() is deprecated, please remove it")
+ENDMACRO (KDE4_INSTALL_LIBTOOL_FILE)
 
-    install_xdg_mimetypes(${CMAKE_INSTALL_PREFIX} ${ARGN})
 
-endmacro (KDE4_INSTALL_XDG_MIMETYPES)