diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-07 14:39:15 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-01-07 14:39:15 (GMT) |
| commit | 91dcc9bef390f6644e1a357ed2226f350742f49b (patch) | |
| tree | a5df1c5b70dd5d671e92f4454404dc71b2b4698e /Source/CPack | |
| parent | 69ccc951cc64d66b56fc1c0ced8f6307ccaee756 (diff) | |
| parent | a1e542f19551072f101404e16e1dad901189f039 (diff) | |
| download | CMake-91dcc9bef390f6644e1a357ed2226f350742f49b.zip CMake-91dcc9bef390f6644e1a357ed2226f350742f49b.tar.gz CMake-91dcc9bef390f6644e1a357ed2226f350742f49b.tar.bz2 | |
Merge topic 'unicode-main'
a1e542f Use Encoding::CommandLineArguments for main() functions.
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cpack.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 438b16d..a19b778 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -25,6 +25,7 @@ #include <cmsys/CommandLineArguments.hxx> #include <cmsys/SystemTools.hxx> +#include <cmsys/Encoding.hxx> //---------------------------------------------------------------------------- static const char * cmDocumentationName[][2] = @@ -97,8 +98,13 @@ int cpackDefinitionArgument(const char* argument, const char* cValue, //---------------------------------------------------------------------------- // this is CPack. -int main (int argc, char *argv[]) +int main (int argc, char const* const* argv) { + cmsys::Encoding::CommandLineArguments args = + cmsys::Encoding::CommandLineArguments::Main(argc, argv); + argc = args.argc(); + argv = args.argv(); + cmSystemTools::FindCMakeResources(argv[0]); cmCPackLog log; |