diff options
author | Brad King <brad.king@kitware.com> | 2019-10-02 11:53:33 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-02 11:53:43 (GMT) |
commit | d57c1a5b3116d1df1bd5a7c2d9857e7b96d2a4f4 (patch) | |
tree | 70119086f84badda59d3df7b35ab1dd59155794c /Source/CPack/WiX/cmCPackWIXGenerator.cxx | |
parent | a4f404d0a5bdb7ce2c403ab65b208703985c4280 (diff) | |
parent | ed98209ddc8d5e9f5b20cd010c69a25d553b2654 (diff) | |
download | CMake-d57c1a5b3116d1df1bd5a7c2d9857e7b96d2a4f4.zip CMake-d57c1a5b3116d1df1bd5a7c2d9857e7b96d2a4f4.tar.gz CMake-d57c1a5b3116d1df1bd5a7c2d9857e7b96d2a4f4.tar.bz2 |
Merge topic 'clang-format-normalize-headers-presentation'
ed98209ddc Revise include order using clang-format-6.0
185fe49f29 clang-format: Normalize headers presentation
42ef28b4f3 Remove unused uid_t/gid_t types on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sebastian Holtermann <sebholt@web.de>
Merge-request: !3851
Diffstat (limited to 'Source/CPack/WiX/cmCPackWIXGenerator.cxx')
-rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index 683f275..5fdbeab 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -2,6 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackWIXGenerator.h" +#include <algorithm> + +#include <cm/string_view> + +#include "cmsys/Directory.hxx" +#include "cmsys/Encoding.hxx" +#include "cmsys/FStream.hxx" +#include "cmsys/SystemTools.hxx" + #include "cmAlgorithms.h" #include "cmCPackComponentGroup.h" #include "cmCPackLog.h" @@ -11,21 +20,12 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmUuid.h" - -#include <algorithm> -#include <cm/string_view> - #include "cmWIXDirectoriesSourceWriter.h" #include "cmWIXFeaturesSourceWriter.h" #include "cmWIXFilesSourceWriter.h" #include "cmWIXRichTextFormatWriter.h" #include "cmWIXSourceWriter.h" -#include "cmsys/Directory.hxx" -#include "cmsys/Encoding.hxx" -#include "cmsys/FStream.hxx" -#include "cmsys/SystemTools.hxx" - #ifdef _WIN32 # include <rpc.h> // for GUID generation (windows only) #else |