summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.cxx
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2019-09-30 14:46:28 (GMT)
committerBrad King <brad.king@kitware.com>2019-10-01 16:26:36 (GMT)
commited98209ddc8d5e9f5b20cd010c69a25d553b2654 (patch)
treebacc6e66e49837c6bbe02996caf360e1e9fbc211 /Source/cmGlobalGenerator.cxx
parent185fe49f29f6632a3c26c376fcb4934e91092ff7 (diff)
downloadCMake-ed98209ddc8d5e9f5b20cd010c69a25d553b2654.zip
CMake-ed98209ddc8d5e9f5b20cd010c69a25d553b2654.tar.gz
CMake-ed98209ddc8d5e9f5b20cd010c69a25d553b2654.tar.bz2
Revise include order using clang-format-6.0
Run the `clang-format.bash` script to update our C and C++ code to a new include order `.clang-format`. Use `clang-format` version 6.0.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r--Source/cmGlobalGenerator.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a75e2ed..d53165c 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