diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-21 15:56:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-21 15:57:05 (GMT) |
| commit | dfb5936f0f1f689d6f729b78379a840971d8149c (patch) | |
| tree | 5c5f4bc8ddfce1441aae7193ee723e35e2983f76 /Source/CPack | |
| parent | ea4c3976fb593d0daf49c52e0a42818cd743b9ff (diff) | |
| parent | be7807478c463c5c875798a3e2e72e148c0d0c3e (diff) | |
| download | CMake-dfb5936f0f1f689d6f729b78379a840971d8149c.zip CMake-dfb5936f0f1f689d6f729b78379a840971d8149c.tar.gz CMake-dfb5936f0f1f689d6f729b78379a840971d8149c.tar.bz2 | |
Merge topic 'shared-string'
be7807478c cmDefinitions: Reduce allocation of keys and values in MakeClosure
e07e2bc8bb bootstrap: Compile cm::String
c1787cb5eb cpack.cxx: Re-order include blocks to follow our conventions
141e307484 cmConfigure.h: Tell windows.h not to define min/max macros
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3669
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cpack.cxx | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 3cf0c10..5abf0ab 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -1,20 +1,6 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#include "cmsys/CommandLineArguments.hxx" -#include "cmsys/Encoding.hxx" -#include <iostream> -#include <map> -#include <sstream> -#include <stddef.h> -#include <string> -#include <utility> -#include <vector> - -#if defined(_WIN32) && !defined(CMAKE_BOOTSTRAP) -# include "cmsys/ConsoleBuf.hxx" -#endif - #include "cmCPackGenerator.h" #include "cmCPackGeneratorFactory.h" #include "cmCPackLog.h" @@ -29,6 +15,21 @@ #include "cmSystemTools.h" #include "cmake.h" +#include "cmsys/CommandLineArguments.hxx" +#include "cmsys/Encoding.hxx" + +#if defined(_WIN32) && !defined(CMAKE_BOOTSTRAP) +# include "cmsys/ConsoleBuf.hxx" +#endif + +#include <iostream> +#include <map> +#include <sstream> +#include <stddef.h> +#include <string> +#include <utility> +#include <vector> + namespace { const char* cmDocumentationName[][2] = { { nullptr, " cpack - Packaging driver provided by CMake." }, |