[Cmake-commits] CMake branch, next, updated. v3.5.2-1346-g085676f

[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  085676f2a188ac700d15ccc1b502446ecb039374 (commit)
       via  cab095e11e618e2bb9a62538a080518946bafd4a (commit)
      from  9290f549e872b96132a923bb27049b5e4886db87 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=085676f2a188ac700d15ccc1b502446ecb039374
commit 085676f2a188ac700d15ccc1b502446ecb039374
Merge: 9290f54 cab095e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 12 09:26:32 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 12 09:26:32 2016 -0400

    Merge topic 'cmake-gui-locale' into next
    
    cab095e1 cmake-gui: Always use "C" locale for numbers (#16099)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cab095e11e618e2bb9a62538a080518946bafd4a
commit cab095e11e618e2bb9a62538a080518946bafd4a
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed May 11 12:51:32 2016 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 12 09:24:36 2016 -0400

    cmake-gui: Always use "C" locale for numbers (#16099)
    
    Set LC_NUMERIC = "C" at startup after Qt initializes the application
    because Qt may have adopted the current locale from the environment.
    CMake does not define behavior for non-C-locale numeric behavior.

diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index b78a5df..1e1f040 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -94,6 +94,8 @@ int main(int argc, char** argv)
 
   QApplication app(argc, argv);
 
+  setlocale(LC_NUMERIC, "C");
+
 #if defined(CMAKE_ENCODING_UTF8)
   QTextCodec* utf8_codec = QTextCodec::codecForName("UTF-8");
   QTextCodec::setCodecForLocale(utf8_codec);

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

Summary of changes:


hooks/post-receive
-- 
CMake