[Cmake-commits] CMake branch, next, updated. v2.8.2-1025-g8d5237e

[Brad King]

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  8d5237e469b64faa37c69ef889ee23a46aa18f58 (commit)
       via  d2f8c5f8ab657f35d71f1f4a67721ead7ee622c4 (commit)
      from  d99c2b95dcc5e8c5234312121dfa0a699bb3c30d (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=8d5237e469b64faa37c69ef889ee23a46aa18f58
commit 8d5237e469b64faa37c69ef889ee23a46aa18f58
Merge: d99c2b9 d2f8c5f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 7 11:12:57 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 7 11:12:57 2010 -0400

    Merge topic 'find-subversion-foreign-lang' into next
    
    d2f8c5f FindSubversion: Use C locale to detect version (#11273)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2f8c5f8ab657f35d71f1f4a67721ead7ee622c4
commit d2f8c5f8ab657f35d71f1f4a67721ead7ee622c4
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Oct 7 16:30:01 2010 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 7 11:10:40 2010 -0400

    FindSubversion: Use C locale to detect version (#11273)
    
    Force LC_ALL to C before the call of the svn executable as it is done in
    the Subversion_WC_INFO macro a few lines below.

diff --git a/Modules/FindSubversion.cmake b/Modules/FindSubversion.cmake
index 61e0253..3561a19 100644
--- a/Modules/FindSubversion.cmake
+++ b/Modules/FindSubversion.cmake
@@ -52,12 +52,19 @@ FIND_PROGRAM(Subversion_SVN_EXECUTABLE svn
 MARK_AS_ADVANCED(Subversion_SVN_EXECUTABLE)
 
 IF(Subversion_SVN_EXECUTABLE)
+  # the subversion commands should be executed with the C locale, otherwise
+  # the message (which are parsed) may be translated, Alex
+  SET(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}")
+  SET(ENV{LC_ALL} C)
 
   EXECUTE_PROCESS(COMMAND ${Subversion_SVN_EXECUTABLE} --version
     OUTPUT_VARIABLE Subversion_VERSION_SVN
     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-  STRING(REGEX REPLACE "^(.*\n)?svn, [Vv]ersion ([.0-9]+).*"
+  # restore the previous LC_ALL
+  SET(ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL})
+
+  STRING(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*"
     "\\2" Subversion_VERSION_SVN "${Subversion_VERSION_SVN}")
 
   MACRO(Subversion_WC_INFO dir prefix)

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

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


hooks/post-receive
-- 
CMake