[Cmake-commits] CMake branch, next, updated. v2.8.2-1021-g19b37e6

[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  19b37e653d1e13b77e02e6f23bec87cda18d0a66 (commit)
       via  42126aaf6ca83bbfbebab364a026763f62770bf7 (commit)
      from  a692da327906df8bb556844e846316b86eec87eb (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=19b37e653d1e13b77e02e6f23bec87cda18d0a66
commit 19b37e653d1e13b77e02e6f23bec87cda18d0a66
Merge: a692da3 42126aa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 7 10:11:54 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 7 10:11:54 2010 -0400

    Merge topic 'find-subversion-foreign-lang' into next
    
    42126aa FindSubversion: Fix for German localized client (#11273)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42126aaf6ca83bbfbebab364a026763f62770bf7
commit 42126aaf6ca83bbfbebab364a026763f62770bf7
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Oct 7 00:24:44 2010 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 7 10:04:19 2010 -0400

    FindSubversion: Fix for German localized client (#11273)
    
    On a Win32 system with a German version of SilkSVN I couldn't run CMake
    again on the working copy as the cache is displayed as corrupted. The
    cause is that the regular expression to find the version number will not
    match and put everything from the "svn --version" output into the cache,
    which contains umlauts and other funny characters.
    
    Fix the regexp to not only match " version " but also " Version " as
    it's in the German output. I have no idea what will happen on a French
    or Japanese system. This should be easy to test as it happens also on a
    German Linux system.

diff --git a/Modules/FindSubversion.cmake b/Modules/FindSubversion.cmake
index daf3d87..61e0253 100644
--- a/Modules/FindSubversion.cmake
+++ b/Modules/FindSubversion.cmake
@@ -57,7 +57,7 @@ IF(Subversion_SVN_EXECUTABLE)
     OUTPUT_VARIABLE Subversion_VERSION_SVN
     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-  STRING(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*"
+  STRING(REGEX REPLACE "^(.*\n)?svn, [Vv]ersion ([.0-9]+).*"
     "\\2" Subversion_VERSION_SVN "${Subversion_VERSION_SVN}")
 
   MACRO(Subversion_WC_INFO dir prefix)

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

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


hooks/post-receive
-- 
CMake