diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-06 18:35:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-06 18:35:21 (GMT) |
| commit | 0f870234febd9dba0df78e903b412ea19d681062 (patch) | |
| tree | 05f5d59ee7ddb4e991c50fbe9a6b8ef3484d92fc /Source/CPack/cpack.cxx | |
| parent | 78c4418fa0a08b63a944ac66821e8bd95fdd73e0 (diff) | |
| parent | cd408d93fdf347ff63a8062f75f1f4ee3e898b17 (diff) | |
| download | CMake-0f870234febd9dba0df78e903b412ea19d681062.zip CMake-0f870234febd9dba0df78e903b412ea19d681062.tar.gz CMake-0f870234febd9dba0df78e903b412ea19d681062.tar.bz2 | |
Merge branch 'backport-no-global-setlocale' into no-global-setlocale
Resolve conflict in Source/CMakeLists.txt by taking both changes.
Diffstat (limited to 'Source/CPack/cpack.cxx')
| -rw-r--r-- | Source/CPack/cpack.cxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 00bfe5b..6106472 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(); |