[Cmake-commits] CMake branch, next, updated. v2.8.6-1910-g67d15e6

Alexander Neundorf neundorf at kde.org
Wed Nov 16 14:57:12 EST 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  67d15e668e65940d9bb04eddb239e97e5608f79d (commit)
       via  65dde30dddbe495877a3ecfef5a2d0015449b69c (commit)
      from  35fc04b4398310294d55f4343853555307946a25 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67d15e668e65940d9bb04eddb239e97e5608f79d
commit 67d15e668e65940d9bb04eddb239e97e5608f79d
Merge: 35fc04b 65dde30
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Wed Nov 16 14:57:09 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 16 14:57:09 2011 -0500

    Merge topic 'FixGettextPoProcessingWithMultipleDots' into next
    
    65dde30 FindGettext: two more fixes for files with multiple dots


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65dde30dddbe495877a3ecfef5a2d0015449b69c
commit 65dde30dddbe495877a3ecfef5a2d0015449b69c
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Nov 16 20:53:59 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Nov 16 20:53:59 2011 +0100

    FindGettext: two more fixes for files with multiple dots
    
    Another patch by Albert Astals Cid for dealing with translation files
    with multiple dots.
    
    Alex

diff --git a/Modules/FindGettext.cmake b/Modules/FindGettext.cmake
index ffe3f26..c44adb4 100644
--- a/Modules/FindGettext.cmake
+++ b/Modules/FindGettext.cmake
@@ -52,7 +52,8 @@ MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg)
    SET(_firstPoFile "${_firstPoFileArg}")
 
    SET(_gmoFiles)
-   GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE)
+   GET_FILENAME_COMPONENT(_potName ${_potFile} NAME)
+   STRING(REGEX REPLACE "^(.+)(\\.[^.]+)$" "\\1" _potBasename ${_potName})
    GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE)
 
    SET(_addToAll)
@@ -92,7 +93,8 @@ FUNCTION(GETTEXT_PROCESS_POT_FILE _potFile)
 
    CMAKE_PARSE_ARGUMENTS(_parsedArguments "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
 
-   GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE)
+   GET_FILENAME_COMPONENT(_potName ${_potFile} NAME)
+   STRING(REGEX REPLACE "^(.+)(\\.[^.]+)$" "\\1" _potBasename ${_potName})
    GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE)
 
    FOREACH (_lang ${_parsedArguments_LANGUAGES})

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindGettext.cmake |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list