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/cmGlobalGenerator.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/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index abe483a9..018037c 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -2,8 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalGenerator.h" -#include "cmsys/Directory.hxx" -#include "cmsys/FStream.hxx" #include <algorithm> #include <cassert> #include <cstdio> @@ -13,6 +11,9 @@ #include <iterator> #include <sstream> +#include "cmsys/Directory.hxx" +#include "cmsys/FStream.hxx" + #if defined(_WIN32) && !defined(__CYGWIN__) # include <windows.h> #endif @@ -45,10 +46,11 @@ #include "cmake.h" #if !defined(CMAKE_BOOTSTRAP) -# include "cmCryptoHash.h" -# include "cmQtAutoGenGlobalInitializer.h" # include "cm_jsoncpp_value.h" # include "cm_jsoncpp_writer.h" + +# include "cmCryptoHash.h" +# include "cmQtAutoGenGlobalInitializer.h" #endif #if defined(_MSC_VER) && _MSC_VER >= 1800 |