Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Brad King
CMake
Commits
730e3862
Commit
730e3862
authored
May 30, 2014
by
Clinton Stimpson
Browse files
Encoding: Add setlocale() to applications.
See also bug #14934 where chinese characters could not be used with cpack.
parent
c4a26b70
Changes
4
Hide whitespace changes
Inline
Side-by-side
Source/CPack/cpack.cxx
View file @
730e3862
...
...
@@ -26,6 +26,7 @@
#include <cmsys/CommandLineArguments.hxx>
#include <cmsys/SystemTools.hxx>
#include <cmsys/Encoding.hxx>
#include <locale.h>
//----------------------------------------------------------------------------
static
const
char
*
cmDocumentationName
[][
2
]
=
...
...
@@ -100,6 +101,7 @@ int cpackDefinitionArgument(const char* argument, const char* cValue,
// this is CPack.
int
main
(
int
argc
,
char
const
*
const
*
argv
)
{
setlocale
(
LC_ALL
,
""
);
cmsys
::
Encoding
::
CommandLineArguments
args
=
cmsys
::
Encoding
::
CommandLineArguments
::
Main
(
argc
,
argv
);
argc
=
args
.
argc
();
...
...
Source/CursesDialog/ccmake.cxx
View file @
730e3862
...
...
@@ -16,6 +16,7 @@
#include <signal.h>
#include <sys/ioctl.h>
#include <locale.h>
#include "cmCursesMainForm.h"
#include "cmCursesStandardIncludes.h"
...
...
@@ -82,6 +83,8 @@ void CMakeMessageHandler(const char* message, const char* title, bool&,
int
main
(
int
argc
,
char
const
*
const
*
argv
)
{
setlocale
(
LC_ALL
,
""
);
cmsys
::
Encoding
::
CommandLineArguments
encoding_args
=
cmsys
::
Encoding
::
CommandLineArguments
::
Main
(
argc
,
argv
);
argc
=
encoding_args
.
argc
();
...
...
Source/cmakemain.cxx
View file @
730e3862
...
...
@@ -25,6 +25,7 @@
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
#include <cmsys/Encoding.hxx>
#include <locale.h>
#ifdef CMAKE_BUILD_WITH_CMAKE
//----------------------------------------------------------------------------
...
...
@@ -162,6 +163,7 @@ static void cmakemainProgressCallback(const char *m, float prog,
int
main
(
int
ac
,
char
const
*
const
*
av
)
{
setlocale
(
LC_ALL
,
""
);
cmsys
::
Encoding
::
CommandLineArguments
args
=
cmsys
::
Encoding
::
CommandLineArguments
::
Main
(
ac
,
av
);
ac
=
args
.
argc
();
...
...
Source/ctest.cxx
View file @
730e3862
...
...
@@ -19,6 +19,7 @@
#include "CTest/cmCTestScriptHandler.h"
#include "CTest/cmCTestLaunch.h"
#include "cmsys/Encoding.hxx"
#include <locale.h>
//----------------------------------------------------------------------------
static
const
char
*
cmDocumentationName
[][
2
]
=
...
...
@@ -114,6 +115,8 @@ static const char * cmDocumentationOptions[][2] =
// this is a test driver program for cmCTest.
int
main
(
int
argc
,
char
const
*
const
*
argv
)
{
setlocale
(
LC_ALL
,
""
);
cmsys
::
Encoding
::
CommandLineArguments
encoding_args
=
cmsys
::
Encoding
::
CommandLineArguments
::
Main
(
argc
,
argv
);
argc
=
encoding_args
.
argc
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment