summaryrefslogtreecommitdiffstats
path: root/Source/CPack/cpack.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-06 18:09:37 (GMT)
committerBrad King <brad.king@kitware.com>2015-02-06 18:32:26 (GMT)
commit87be2e1427ba2b1b7697c9332487862917897dca (patch)
tree4880d84b5d265e45033a23258e2645bbfef0f795 /Source/CPack/cpack.cxx
parent44100adc6c7f7db7bfd4ccf0d8bd18de8ab195c0 (diff)
downloadCMake-87be2e1427ba2b1b7697c9332487862917897dca.zip
CMake-87be2e1427ba2b1b7697c9332487862917897dca.tar.gz
CMake-87be2e1427ba2b1b7697c9332487862917897dca.tar.bz2
Do not call setlocale() globally in CMake applications (#15377)
Revert the changes made by commit v3.1.0-rc1~406^2~1 (Encoding: Add setlocale() to applications, 2014-05-30) and commit v3.1.0-rc1~406^2 (Encoding: Change to only set LC_CTYPE, 2014-06-11), and other setlocale calls added later in their spirit. CMake has not been taught how to deal with non-C locales everywhere. We do not define any functionality for character conversions for non-ASCII strings. Another solution will be needed to address the original problem motivating addition of setlocale() calls.
Diffstat (limited to 'Source/CPack/cpack.cxx')
-rw-r--r--Source/CPack/cpack.cxx2
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index c57028d..0173361 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -26,7 +26,6 @@
#include <cmsys/CommandLineArguments.hxx>
#include <cmsys/SystemTools.hxx>
#include <cmsys/Encoding.hxx>
-#include <locale.h>
//----------------------------------------------------------------------------
static const char * cmDocumentationName[][2] =
@@ -101,7 +100,6 @@ int cpackDefinitionArgument(const char* argument, const char* cValue,
// this is CPack.
int main (int argc, char const* const* argv)
{
- setlocale(LC_CTYPE, "");
cmsys::Encoding::CommandLineArguments args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
argc = args.argc();