[Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-796-g1ef4199

[Nils Gladitz]

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  1ef4199563c059e06d1911011b61a185f5a769ef (commit)
       via  cfb22354b8bff1f7eddc117616a80774d456f467 (commit)
       via  ae09fce8319112f8a401a843d4297e7c157a112a (commit)
      from  a388f6819fca8ebc130dbe9f5c6f157a08885fdd (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=1ef4199563c059e06d1911011b61a185f5a769ef
commit 1ef4199563c059e06d1911011b61a185f5a769ef
Merge: a388f68 cfb2235
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Feb 28 08:23:38 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 28 08:23:38 2015 -0500

    Merge topic 'locale-agnostic-findhg' into next
    
    cfb22354 FindHg: Run hg with C locale when querying its version.
    ae09fce8 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfb22354b8bff1f7eddc117616a80774d456f467
commit cfb22354b8bff1f7eddc117616a80774d456f467
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Feb 28 14:22:41 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Sat Feb 28 14:22:41 2015 +0100

    FindHg: Run hg with C locale when querying its version.
    
    LANGUAGE should be ignored when LC_ALL=C.
    It seems this isn't the case with hg so set both.

diff --git a/Modules/FindHg.cmake b/Modules/FindHg.cmake
index 34d763e..bdbb79b 100644
--- a/Modules/FindHg.cmake
+++ b/Modules/FindHg.cmake
@@ -63,11 +63,21 @@ find_program(HG_EXECUTABLE
 mark_as_advanced(HG_EXECUTABLE)
 
 if(HG_EXECUTABLE)
+  set(_saved_lc_all "$ENV{LC_ALL}")
+  set(ENV{LC_ALL} "C")
+
+  set(_saved_language "$ENV{LANGUAGE}")
+  set(ENV{LANGUAGE})
+
   execute_process(COMMAND ${HG_EXECUTABLE} --version
                   OUTPUT_VARIABLE hg_version
                   ERROR_QUIET
                   RESULT_VARIABLE hg_result
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  set(ENV{LC_ALL} ${_saved_lc_all})
+  set(ENV{LANGUAGE} ${_saved_language})
+
   if(hg_result MATCHES "is not a valid Win32 application")
     set_property(CACHE HG_EXECUTABLE PROPERTY VALUE "HG_EXECUTABLE-NOTFOUND")
   endif()

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

Summary of changes:
 Modules/FindHg.cmake      |   10 ++++++++++
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake