diff options
| author | David Cole <david.cole@kitware.com> | 2010-10-12 15:06:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-10-12 15:06:41 (GMT) |
| commit | 77f045c57af607704bcb42689f3b7837b8659b62 (patch) | |
| tree | 6f1f4052fccf5418af737fa6ca7a4ff40a862196 | |
| parent | 1b98d04e1a70d02dd079faaf08c33defb9a02af1 (diff) | |
| parent | d2f8c5f8ab657f35d71f1f4a67721ead7ee622c4 (diff) | |
| download | CMake-77f045c57af607704bcb42689f3b7837b8659b62.zip CMake-77f045c57af607704bcb42689f3b7837b8659b62.tar.gz CMake-77f045c57af607704bcb42689f3b7837b8659b62.tar.bz2 | |
Merge topic 'find-subversion-foreign-lang'
d2f8c5f FindSubversion: Use C locale to detect version (#11273)
42126aa FindSubversion: Fix for German localized client (#11273)
| -rw-r--r-- | Modules/FindSubversion.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Modules/FindSubversion.cmake b/Modules/FindSubversion.cmake index daf3d87..3561a19 100644 --- a/Modules/FindSubversion.cmake +++ b/Modules/FindSubversion.cmake @@ -52,11 +52,18 @@ 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) + # 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}") |