[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3522-g3673b15

[Clinton Stimpson]

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  3673b151f503bc49143bd01d6cb6a855dad3f972 (commit)
       via  730e386291cb7aad8f532125216b2ec71d710748 (commit)
      from  a9be1425e900b7a188b77e3218e194bf8bd23d6e (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=3673b151f503bc49143bd01d6cb6a855dad3f972
commit 3673b151f503bc49143bd01d6cb6a855dad3f972
Merge: a9be142 730e386
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Jun 3 20:28:34 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 3 20:28:34 2014 -0400

    Merge topic 'setlocale' into next
    
    730e3862 Encoding: Add setlocale() to applications.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=730e386291cb7aad8f532125216b2ec71d710748
commit 730e386291cb7aad8f532125216b2ec71d710748
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri May 30 21:41:48 2014 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Tue Jun 3 18:22:25 2014 -0600

    Encoding: Add setlocale() to applications.
    
    See also bug #14934 where chinese characters could not be used with cpack.

diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 2aa5991..ad37c42 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -26,6 +26,7 @@
 #include <cmsys/CommandLineArguments.hxx>
 #include <cmsys/SystemTools.hxx>
 #include <cmsys/Encoding.hxx>
+#include <locale.h>
 
 //----------------------------------------------------------------------------
 static const char * cmDocumentationName[][2] =
@@ -100,6 +101,7 @@ int cpackDefinitionArgument(const char* argument, const char* cValue,
 // this is CPack.
 int main (int argc, char const* const* argv)
 {
+  setlocale(LC_ALL, "");
   cmsys::Encoding::CommandLineArguments args =
     cmsys::Encoding::CommandLineArguments::Main(argc, argv);
   argc = args.argc();
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index d70bedb..a9d4d98 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -16,6 +16,7 @@
 
 #include <signal.h>
 #include <sys/ioctl.h>
+#include <locale.h>
 
 #include "cmCursesMainForm.h"
 #include "cmCursesStandardIncludes.h"
@@ -82,6 +83,8 @@ void CMakeMessageHandler(const char* message, const char* title, bool&,
 
 int main(int argc, char const* const* argv)
 {
+  setlocale(LC_ALL, "");
+
   cmsys::Encoding::CommandLineArguments encoding_args =
     cmsys::Encoding::CommandLineArguments::Main(argc, argv);
   argc = encoding_args.argc();
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 77f1e4e..9f9f6bb 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -25,6 +25,7 @@
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include <cmsys/Encoding.hxx>
+#include <locale.h>
 
 #ifdef CMAKE_BUILD_WITH_CMAKE
 //----------------------------------------------------------------------------
@@ -162,6 +163,7 @@ static void cmakemainProgressCallback(const char *m, float prog,
 
 int main(int ac, char const* const* av)
 {
+  setlocale(LC_ALL, "");
   cmsys::Encoding::CommandLineArguments args =
     cmsys::Encoding::CommandLineArguments::Main(ac, av);
   ac = args.argc();
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 3eb5551..0848f19 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -19,6 +19,7 @@
 #include "CTest/cmCTestScriptHandler.h"
 #include "CTest/cmCTestLaunch.h"
 #include "cmsys/Encoding.hxx"
+#include <locale.h>
 
 //----------------------------------------------------------------------------
 static const char * cmDocumentationName[][2] =
@@ -114,6 +115,8 @@ static const char * cmDocumentationOptions[][2] =
 // this is a test driver program for cmCTest.
 int main (int argc, char const* const* argv)
 {
+  setlocale(LC_ALL, "");
+
   cmsys::Encoding::CommandLineArguments encoding_args =
     cmsys::Encoding::CommandLineArguments::Main(argc, argv);
   argc = encoding_args.argc();

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

Summary of changes:


hooks/post-receive
-- 
CMake