kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Clinton Stimpson 2014-06-11 22:27:39 -06:00
parent 730e386291
commit c746b00eee
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CPack/cpack.cxx
View File

@ -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();

2
Source/CursesDialog/ccmake.cxx
View File

@ -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);

2
Source/cmakemain.cxx
View File

@ -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();

2
Source/ctest.cxx
View File

@ -115,7 +115,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);