[Cmake-commits] CMake branch, next, updated. v2.8.6-1877-gf372230

[Alexander Neundorf]

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  f372230e30da80f8c019da371ad48bf4a320bc8c (commit)
       via  e48fcfffa36ca34703a4c366cb96593373234faa (commit)
       via  ecb4459e31a0defec084ca0a02e0450da718afdb (commit)
      from  c10dedab552492299476ec1b9428c36581ac62b5 (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=f372230e30da80f8c019da371ad48bf4a320bc8c
commit f372230e30da80f8c019da371ad48bf4a320bc8c
Merge: c10deda e48fcff
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Tue Nov 15 13:01:11 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 15 13:01:11 2011 -0500

    Merge topic 'FixGettextPoProcessingWithMultipleDots' into next
    
    e48fcff -make GETTEXT_PROCESS_PO_FILES() work with files with multiple dots
    ecb4459 Strip trailing whitespace


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e48fcfffa36ca34703a4c366cb96593373234faa
commit e48fcfffa36ca34703a4c366cb96593373234faa
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Nov 15 18:49:47 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Nov 15 18:49:47 2011 +0100

    -make GETTEXT_PROCESS_PO_FILES() work with files with multiple dots
    
    Patch by Albert Astals Cid.
    E.g. plasma_package_org.kde.activityswitcher.po will now be installed
    correctly as plasma_package_org.kde.activityswitcher.mo, and not as
    plasma_package_org.mo.
    
    This is kind-of related to #12282
    
    Alex

diff --git a/Modules/FindGettext.cmake b/Modules/FindGettext.cmake
index 7c3a261..ffe3f26 100644
--- a/Modules/FindGettext.cmake
+++ b/Modules/FindGettext.cmake
@@ -134,7 +134,8 @@ FUNCTION(GETTEXT_PROCESS_PO_FILES _lang)
    CMAKE_PARSE_ARGUMENTS(_parsedArguments "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
 
    FOREACH(_current_PO_FILE ${_parsedArguments_PO_FILES})
-      GET_FILENAME_COMPONENT(_basename ${_current_PO_FILE} NAME_WE)
+      GET_FILENAME_COMPONENT(_name ${_current_PO_FILE} NAME)
+      STRING(REGEX REPLACE "^(.+)(\\.[^.]+)$" "\\1" _basename ${_name})
       SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.gmo)
       ADD_CUSTOM_COMMAND(OUTPUT ${_gmoFile}
             COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_current_PO_FILE}

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ecb4459e31a0defec084ca0a02e0450da718afdb
commit ecb4459e31a0defec084ca0a02e0450da718afdb
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Nov 15 18:48:38 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Nov 15 18:48:38 2011 +0100

    Strip trailing whitespace
    
    Alex

diff --git a/Modules/FindGettext.cmake b/Modules/FindGettext.cmake
index 0f11234..7c3a261 100644
--- a/Modules/FindGettext.cmake
+++ b/Modules/FindGettext.cmake
@@ -1,5 +1,5 @@
 # - Find GNU gettext tools
-# This module looks for the GNU gettext tools. This module defines the 
+# This module looks for the GNU gettext tools. This module defines the
 # following values:
 #  GETTEXT_MSGMERGE_EXECUTABLE: the full path to the msgmerge tool.
 #  GETTEXT_MSGFMT_EXECUTABLE: the full path to the msgfmt tool.
@@ -7,8 +7,8 @@
 #
 # Additionally it provides the following macros:
 # GETTEXT_CREATE_TRANSLATIONS ( outputFile [ALL] file1 ... fileN )
-#    This will create a target "translations" which will convert the 
-#    given input po files into the binary output mo file. If the 
+#    This will create a target "translations" which will convert the
+#    given input po files into the binary output mo file. If the
 #    ALL option is used, the translations will also be created when
 #    building the default target.
 # GETTEXT_PROCESS_POT( <potfile> [ALL] [INSTALL_DESTINATION <destdir>] LANGUAGES <lang1> <lang2> ... )

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

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


hooks/post-receive
-- 
CMake