Commit 067b21b6 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'clang-format-include-order'

e1c77472 Format include directive blocks and ordering with clang-format
180538c7 Source: Stabilize include order
0e7bca92 Utilities/Release: Stabilize include order in WiX custom action
eb817be0 Tests: Stabilize include order in MFC, VSXaml, and VSWinStorePhone
eda313b4 Tests: Stabilize include order in StringFileTest
7110b754 CursesDialog: add missing cmState include
d7a5f255 Modules: Remove unused CMakeTestWatcomVersion.c file
parents 2e6684c6 e1c77472
#include <stdio.h>
#include <pthread.h>
#include <stdio.h>
#include <unistd.h>
void* runner(void*);
......
......@@ -12,24 +12,24 @@
#include "cmCPackIFWGenerator.h"
#include "cmCPackIFWPackage.h"
#include "cmCPackIFWInstaller.h"
#include "cmCPackIFWPackage.h"
#include <CPack/cmCPackLog.h>
#include <CPack/cmCPackComponentGroup.h>
#include <CPack/cmCPackLog.h>
#include <cmsys/SystemTools.hxx>
#include <cmsys/Glob.hxx>
#include <cmsys/Directory.hxx>
#include <cmsys/Glob.hxx>
#include <cmsys/RegularExpression.hxx>
#include <cmsys/SystemTools.hxx>
#include <cmGeneratedFileStream.h>
#include <cmGlobalGenerator.h>
#include <cmSystemTools.h>
#include <cmMakefile.h>
#include <cmGeneratedFileStream.h>
#include <cmXMLWriter.h>
#include <cmVersionConfig.h>
#include <cmSystemTools.h>
#include <cmTimestamp.h>
#include <cmVersionConfig.h>
#include <cmXMLWriter.h>
//----------------------------------------------------------------------------
cmCPackIFWGenerator::cmCPackIFWGenerator()
......
......@@ -15,8 +15,8 @@
#include <CPack/cmCPackGenerator.h>
#include "cmCPackIFWPackage.h"
#include "cmCPackIFWInstaller.h"
#include "cmCPackIFWPackage.h"
class cmXMLWriter;
......
......@@ -9,9 +9,9 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
#include <cmsys/SystemTools.hxx>
#include <cmsys/Process.h>
#include <cmsys/FStream.hxx>
#include <cmsys/Process.h>
#include <cmsys/SystemTools.hxx>
#include <iostream>
......
......@@ -12,23 +12,23 @@
#include "cmCPackWIXGenerator.h"
#include <cmSystemTools.h>
#include <cmGeneratedFileStream.h>
#include <CPack/cmCPackComponentGroup.h>
#include <CPack/cmCPackLog.h>
#include <cmCryptoHash.h>
#include <cmGeneratedFileStream.h>
#include <cmInstalledFile.h>
#include <CPack/cmCPackLog.h>
#include <CPack/cmCPackComponentGroup.h>
#include <cmSystemTools.h>
#include "cmWIXSourceWriter.h"
#include "cmWIXDirectoriesSourceWriter.h"
#include "cmWIXFeaturesSourceWriter.h"
#include "cmWIXFilesSourceWriter.h"
#include "cmWIXRichTextFormatWriter.h"
#include "cmWIXSourceWriter.h"
#include <cmsys/SystemTools.hxx>
#include <cmsys/Directory.hxx>
#include <cmsys/Encoding.hxx>
#include <cmsys/FStream.hxx>
#include <cmsys/SystemTools.hxx>
#include <rpc.h> // for GUID generation
......
......@@ -13,13 +13,13 @@
#ifndef cmCPackWIXGenerator_h
#define cmCPackWIXGenerator_h
#include <CPack/cmCPackGenerator.h>
#include "cmWIXPatch.h"
#include "cmWIXShortcut.h"
#include <CPack/cmCPackGenerator.h>
#include <string>
#include <map>
#include <string>
class cmWIXSourceWriter;
class cmWIXDirectoriesSourceWriter;
......
......@@ -13,11 +13,11 @@
#ifndef cmWIXAccessControlList_h
#define cmWIXAccessControlList_h
#include <cmInstalledFile.h>
#include <CPack/cmCPackLog.h>
#include "cmWIXSourceWriter.h"
#include <CPack/cmCPackLog.h>
#include <cmInstalledFile.h>
class cmWIXAccessControlList
{
public:
......
......@@ -14,6 +14,7 @@
#define cmWIXFeaturesSourceWriter_h
#include "cmWIXSourceWriter.h"
#include <CPack/cmCPackGenerator.h>
/** \class cmWIXFeaturesSourceWriter
......
......@@ -11,6 +11,7 @@
============================================================================*/
#include "cmWIXFilesSourceWriter.h"
#include "cmWIXAccessControlList.h"
#include <cmInstalledFile.h>
......
......@@ -14,8 +14,9 @@
#define cmWIXFilesSourceWriter_h
#include "cmWIXSourceWriter.h"
#include "cmWIXShortcut.h"
#include "cmWIXPatch.h"
#include "cmWIXShortcut.h"
#include <CPack/cmCPackGenerator.h>
......
......@@ -13,8 +13,8 @@
#ifndef cmWIXPatch_h
#define cmWIXPatch_h
#include "cmWIXSourceWriter.h"
#include "cmWIXPatchParser.h"
#include "cmWIXSourceWriter.h"
#include <string>
......
......@@ -13,10 +13,10 @@
#ifndef cmCPackWIXPatchParser_h
#define cmCPackWIXPatchParser_h
#include <cmXMLParser.h>
#include <CPack/cmCPackLog.h>
#include <cmXMLParser.h>
#include <map>
#include <list>
......
......@@ -13,6 +13,8 @@
#ifndef cmWIXRichTextFormatWriter_h
#define cmWIXRichTextFormatWriter_h
#include "cmStandardIncludes.h"
#include <cmsys/FStream.hxx>
/** \class cmWIXRichtTextFormatWriter
......
......@@ -13,13 +13,13 @@
#ifndef cmWIXShortcut_h
#define cmWIXShortcut_h
#include <string>
#include <cmInstalledFile.h>
#include <map>
#include <set>
#include <string>
#include <vector>
#include <cmInstalledFile.h>
class cmWIXFilesSourceWriter;
struct cmWIXShortcut
......
......@@ -10,8 +10,6 @@
See the License for more information.
============================================================================*/
#include "cmStandardIncludes.h"
#include "cmWIXSourceWriter.h"
#include <CPack/cmCPackGenerator.h>
......
......@@ -13,11 +13,12 @@
#ifndef cmWIXSourceWriter_h
#define cmWIXSourceWriter_h
#include <vector>
#include <string>
#include <CPack/cmCPackLog.h>
#include <cmsys/FStream.hxx>
#include <CPack/cmCPackLog.h>
#include <string>
#include <vector>
/** \class cmWIXSourceWriter
* \brief Helper class to generate XML WiX source files
......
......@@ -12,17 +12,17 @@
#include "cmCPackArchiveGenerator.h"
#include "cmake.h"
#include "cmCPackLog.h"
#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
#include "cmSystemTools.h"
#include "cmMakefile.h"
#include "cmGeneratedFileStream.h"
#include "cmCPackLog.h"
#include "cmSystemTools.h"
#include "cmake.h"
#include <errno.h>
#include <cmsys/SystemTools.hxx>
#include <cmsys/Directory.hxx>
#include <cm_libarchive.h>
#include <cmsys/Directory.hxx>
#include <cmsys/SystemTools.hxx>
//----------------------------------------------------------------------
cmCPackArchiveGenerator::cmCPackArchiveGenerator(cmArchiveWrite::Compress t,
......
......@@ -13,9 +13,10 @@
#ifndef cmCPackArchiveGenerator_h
#define cmCPackArchiveGenerator_h
#include "cmArchiveWrite.h"
#include "cmCPackGenerator.h"
#include "cmArchiveWrite.h"
/** \class cmCPackArchiveGenerator
* \brief A generator base for libarchive generation.
......
......@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCPackBundleGenerator.h"
#include "cmCPackLog.h"
#include "cmSystemTools.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment