summaryrefslogtreecommitdiffstats
path: root/Source/cmSystemTools.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/cmSystemTools.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/cmSystemTools.cxx')
-rw-r--r--Source/cmSystemTools.cxx25
1 files changed, 15 insertions, 10 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 62a8d8f..a50e829 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2,17 +2,19 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmSystemTools.h"
+#include "cm_uv.h"
+
#include "cmAlgorithms.h"
#include "cmDuration.h"
#include "cmProcessOutput.h"
#include "cmRange.h"
#include "cmStringAlgorithms.h"
-#include "cm_uv.h"
#if !defined(CMAKE_BOOTSTRAP)
+# include "cm_libarchive.h"
+
# include "cmArchiveWrite.h"
# include "cmLocale.h"
-# include "cm_libarchive.h"
# ifndef __LA_INT64_T
# define __LA_INT64_T la_int64_t
# endif
@@ -33,12 +35,6 @@
# include "cmMachO.h"
#endif
-#include "cmsys/Directory.hxx"
-#include "cmsys/Encoding.hxx"
-#include "cmsys/FStream.hxx"
-#include "cmsys/RegularExpression.hxx"
-#include "cmsys/System.h"
-#include "cmsys/Terminal.h"
#include <algorithm>
#include <cassert>
#include <cctype>
@@ -47,19 +43,28 @@
#include <cstdlib>
#include <cstring>
#include <ctime>
-#include <fcntl.h>
#include <iostream>
#include <sstream>
#include <utility>
#include <vector>
+#include <fcntl.h>
+
+#include "cmsys/Directory.hxx"
+#include "cmsys/Encoding.hxx"
+#include "cmsys/FStream.hxx"
+#include "cmsys/RegularExpression.hxx"
+#include "cmsys/System.h"
+#include "cmsys/Terminal.h"
+
#if defined(_WIN32)
# include <windows.h>
// include wincrypt.h after windows.h
# include <wincrypt.h>
#else
-# include <sys/time.h>
# include <unistd.h>
+
+# include <sys/time.h>
#endif
#if defined(_WIN32) && \