summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-06-13 19:44:59 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-06-13 19:44:59 (GMT)
commitf69501dfe2b6dc268ba9409a53e1413223187434 (patch)
treeebb5bc548d7d3adfa4f88e1e4a70f53bfee2af05 /Source
parentba36363121f2004c196e785d5b67883a09160ec0 (diff)
parentc746b00eee09a48f6a180bf4955a7b90496f12f3 (diff)
downloadCMake-f69501dfe2b6dc268ba9409a53e1413223187434.zip
CMake-f69501dfe2b6dc268ba9409a53e1413223187434.tar.gz
CMake-f69501dfe2b6dc268ba9409a53e1413223187434.tar.bz2
Merge topic 'setlocale'
c746b00e Encoding: Change to only set LC_CTYPE to fix encoding issues with libarchive.
Diffstat (limited to 'Source')
-rw-r--r--Source/CPack/cpack.cxx2
-rw-r--r--Source/CursesDialog/ccmake.cxx2
-rw-r--r--Source/cmakemain.cxx2
-rw-r--r--Source/ctest.cxx2
4 files changed, 4 insertions, 4 deletions
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 167e348..ff32de9 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -116,7 +116,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);