Commit f69501df authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'setlocale'

c746b00e Encoding:  Change to only set LC_CTYPE to fix encoding issues with libarchive.
parents ba363631 c746b00e
...@@ -101,7 +101,7 @@ int cpackDefinitionArgument(const char* argument, const char* cValue, ...@@ -101,7 +101,7 @@ int cpackDefinitionArgument(const char* argument, const char* cValue,
// this is CPack. // this is CPack.
int main (int argc, char const* const* argv) int main (int argc, char const* const* argv)
{ {
setlocale(LC_ALL, ""); setlocale(LC_CTYPE, "");
cmsys::Encoding::CommandLineArguments args = cmsys::Encoding::CommandLineArguments args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv); cmsys::Encoding::CommandLineArguments::Main(argc, argv);
argc = args.argc(); argc = args.argc();
......
...@@ -83,7 +83,7 @@ void CMakeMessageHandler(const char* message, const char* title, bool&, ...@@ -83,7 +83,7 @@ void CMakeMessageHandler(const char* message, const char* title, bool&,
int main(int argc, char const* const* argv) int main(int argc, char const* const* argv)
{ {
setlocale(LC_ALL, ""); setlocale(LC_CTYPE, "");
cmsys::Encoding::CommandLineArguments encoding_args = cmsys::Encoding::CommandLineArguments encoding_args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv); cmsys::Encoding::CommandLineArguments::Main(argc, argv);
......
...@@ -163,7 +163,7 @@ static void cmakemainProgressCallback(const char *m, float prog, ...@@ -163,7 +163,7 @@ static void cmakemainProgressCallback(const char *m, float prog,
int main(int ac, char const* const* av) int main(int ac, char const* const* av)
{ {
setlocale(LC_ALL, ""); setlocale(LC_CTYPE, "");
cmsys::Encoding::CommandLineArguments args = cmsys::Encoding::CommandLineArguments args =
cmsys::Encoding::CommandLineArguments::Main(ac, av); cmsys::Encoding::CommandLineArguments::Main(ac, av);
ac = args.argc(); ac = args.argc();
......
...@@ -116,7 +116,7 @@ static const char * cmDocumentationOptions[][2] = ...@@ -116,7 +116,7 @@ static const char * cmDocumentationOptions[][2] =
// this is a test driver program for cmCTest. // this is a test driver program for cmCTest.
int main (int argc, char const* const* argv) int main (int argc, char const* const* argv)
{ {
setlocale(LC_ALL, ""); setlocale(LC_CTYPE, "");
cmsys::Encoding::CommandLineArguments encoding_args = cmsys::Encoding::CommandLineArguments encoding_args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv); cmsys::Encoding::CommandLineArguments::Main(argc, argv);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment