diff options
| author | Patrick Spendrin <ps_ml@gmx.de> | 2007-12-02 12:40:16 +0000 |
|---|---|---|
| committer | Patrick Spendrin <ps_ml@gmx.de> | 2007-12-02 12:40:16 +0000 |
| commit | 965e3c90e0f222afe23255c694103b922c5cf602 (patch) | |
| tree | 7ae5a06212559e1db42ba03123094bcb8c76e149 | |
| parent | dd3709f07408f6f42da0f5be8b6f997a674169df (diff) | |
| download | extra-cmake-modules-965e3c90e0f222afe23255c694103b922c5cf602.tar.gz extra-cmake-modules-965e3c90e0f222afe23255c694103b922c5cf602.tar.bz2 | |
problem on win32 - might be another problem somewhere else - packaging perhaps?
svn path=/trunk/KDE/kdelibs/; revision=743951
| -rw-r--r-- | modules/FindSharedMimeInfo.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/FindSharedMimeInfo.cmake b/modules/FindSharedMimeInfo.cmake index 8b10d208..154e58a5 100644 --- a/modules/FindSharedMimeInfo.cmake +++ b/modules/FindSharedMimeInfo.cmake @@ -27,17 +27,15 @@ else (UPDATE_MIME_DATABASE_EXECUTABLE) exec_program (${UPDATE_MIME_DATABASE_EXECUTABLE} ARGS -v RETURN_VALUE _null OUTPUT_VARIABLE _smiVersionRaw) - string(REGEX REPLACE "update-mime-database \\(shared-mime-info\\) ([0-9]\\.[0-9]+).*" + string(REGEX REPLACE "update-mime-database \\([a-zA-Z\\-]+\\) ([0-9]\\.[0-9]+).*" "\\1" smiVersion "${_smiVersionRaw}") - set (SHARED_MIME_INFO_FOUND TRUE) endif (UPDATE_MIME_DATABASE_EXECUTABLE) if (SHARED_MIME_INFO_FOUND) if (NOT SharedMimeInfo_FIND_QUIETLY) message(STATUS "Found shared-mime-info version: ${smiVersion}") - - macro_ensure_version2(${SHARED_MIME_INFO_MINIMUM_VERSION} ${smiVersion} _smiVersion_OK) + macro_ensure_version(${SHARED_MIME_INFO_MINIMUM_VERSION} ${smiVersion} _smiVersion_OK) if (NOT _smiVersion_OK) message(STATUS "WARNING: the found version of shared-mime-info (${smiVersion}) is below the minimum required (${SHARED_MIME_INFO_MINIMUM_VERSION})") endif (NOT _smiVersion_OK) |