[Cmake-commits] CMake branch, next, updated. v3.0.0-3687-g6120672

[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  612067216b407ee9791c79bbefc06f8e2f24e946 (commit)
       via  c746b00eee09a48f6a180bf4955a7b90496f12f3 (commit)
      from  93f55d8f32898c524862cc398f518bbfa0954b0d (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=612067216b407ee9791c79bbefc06f8e2f24e946
commit 612067216b407ee9791c79bbefc06f8e2f24e946
Merge: 93f55d8 c746b00
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Jun 12 00:33:38 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 12 00:33:38 2014 -0400

    Merge topic 'setlocale' into next
    
    c746b00e Encoding:  Change to only set LC_CTYPE to fix encoding issues with libarchive.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c746b00eee09a48f6a180bf4955a7b90496f12f3
commit c746b00eee09a48f6a180bf4955a7b90496f12f3
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Jun 11 22:27:39 2014 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Jun 11 22:29:16 2014 -0600

    Encoding:  Change to only set LC_CTYPE to fix encoding issues with libarchive.
    
    Changing all categories with LC_ALL causes test failures in some locales.
    For example, in some locales, the decimal characer could be a comma instead of period.

diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index ad37c42..98c62d5 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -101,7 +101,7 @@ int cpackDefinitionArgument(const char* argument, const char* cValue,
 // this is CPack.
 int main (int argc, char const* const* argv)
 {
-  setlocale(LC_ALL, "");
+  setlocale(LC_CTYPE, "");
   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 a9d4d98..54f2151 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -83,7 +83,7 @@ void CMakeMessageHandler(const char* message, const char* title, bool&,
 
 int main(int argc, char const* const* argv)
 {
-  setlocale(LC_ALL, "");
+  setlocale(LC_CTYPE, "");
 
   cmsys::Encoding::CommandLineArguments encoding_args =
     cmsys::Encoding::CommandLineArguments::Main(argc, argv);
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 9f9f6bb..d8540cb 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -163,7 +163,7 @@ static void cmakemainProgressCallback(const char *m, float prog,
 
 int main(int ac, char const* const* av)
 {
-  setlocale(LC_ALL, "");
+  setlocale(LC_CTYPE, "");
   cmsys::Encoding::CommandLineArguments args =
     cmsys::Encoding::CommandLineArguments::Main(ac, av);
   ac = args.argc();
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 0848f19..92d2df5 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -115,7 +115,7 @@ static const char * cmDocumentationOptions[][2] =
 // this is a test driver program for cmCTest.
 int main (int argc, char const* const* argv)
 {
-  setlocale(LC_ALL, "");
+  setlocale(LC_CTYPE, "");
 
   cmsys::Encoding::CommandLineArguments encoding_args =
     cmsys::Encoding::CommandLineArguments::Main(argc, argv);

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

Summary of changes:
 Source/CPack/cpack.cxx         |    2 +-
 Source/CursesDialog/ccmake.cxx |    2 +-
 Source/cmakemain.cxx           |    2 +-
 Source/ctest.cxx               |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake