Commit 2e620f0b authored by Daniel Pfeifer's avatar Daniel Pfeifer Committed by Brad King
Browse files

Fix several include-what-you-use findings

parent f52bcc2a
......@@ -2,6 +2,9 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmGeneratorExpression.h"
#include <cmsys/RegularExpression.hxx>
#include <utility>
#include "assert.h"
#include "cmAlgorithms.h"
#include "cmGeneratorExpressionContext.h"
......@@ -9,9 +12,7 @@
#include "cmGeneratorExpressionLexer.h"
#include "cmGeneratorExpressionParser.h"
#include "cmSystemTools.h"
#include <cmsys/RegularExpression.hxx>
#include <utility>
#include "cm_auto_ptr.hxx"
cmGeneratorExpression::cmGeneratorExpression(
const cmListFileBacktrace& backtrace)
......
......@@ -2,6 +2,11 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmGeneratorExpressionEvaluationFile.h"
#include <cmConfigure.h>
#include <cmsys/FStream.hxx>
#include <sstream>
#include <utility>
#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
#include "cmListFileCache.h"
......@@ -9,13 +14,9 @@
#include "cmMakefile.h"
#include "cmSourceFile.h"
#include "cmSystemTools.h"
#include "cm_auto_ptr.hxx"
#include "cmake.h"
#include <cmConfigure.h>
#include <cmsys/FStream.hxx>
#include <sstream>
#include <utility>
cmGeneratorExpressionEvaluationFile::cmGeneratorExpressionEvaluationFile(
const std::string& input,
CM_AUTO_PTR<cmCompiledGeneratorExpression> outputFileExpr,
......
......@@ -5,14 +5,19 @@
#include <cmConfigure.h> // IWYU pragma: keep
#include "cmGeneratorExpression.h"
#include <cm_auto_ptr.hxx>
#include <map>
#include <string>
#include <sys/types.h>
#include <vector>
#include "cmGeneratorExpression.h"
#include "cm_auto_ptr.hxx"
#if defined(_MSC_VER)
typedef unsigned short mode_t;
#else
#include <sys/types.h>
#endif
class cmLocalGenerator;
class cmGeneratorExpressionEvaluationFile
......
......@@ -2,6 +2,17 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmGeneratorTarget.h"
#include <algorithm>
#include <assert.h>
#include <cmsys/RegularExpression.hxx>
#include <errno.h>
#include <iterator>
#include <queue>
#include <sstream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "cmAlgorithms.h"
#include "cmComputeLinkInformation.h"
#include "cmCustomCommand.h"
......@@ -24,16 +35,7 @@
#include "cm_unordered_set.hxx"
#include "cmake.h"
#include <algorithm>
#include <assert.h>
#include <cmsys/RegularExpression.hxx>
#include <errno.h>
#include <iterator>
#include <queue>
#include <sstream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
class cmMessenger;
template <>
const char* cmTargetPropertyComputer::GetSources<cmGeneratorTarget>(
......
......@@ -2,7 +2,6 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmGetCMakePropertyCommand.h"
#include <algorithm>
#include <set>
#include "cmAlgorithms.h"
......
......@@ -2,6 +2,7 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmGlobalBorlandMakefileGenerator.h"
#include "cmDocumentationEntry.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
#include "cmState.h"
......
......@@ -9,6 +9,16 @@
#include "cmGlobalGenerator.h"
#include <algorithm>
#include <assert.h>
#include <cmsys/Directory.hxx>
#include <cmsys/FStream.hxx>
#include <iterator>
#include <sstream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "cmAlgorithms.h"
#include "cmCPackPropertiesGenerator.h"
#include "cmComputeTargetDepends.h"
......@@ -29,20 +39,11 @@
#include "cmQtAutoGeneratorInitializer.h"
#include "cmSourceFile.h"
#include "cmState.h"
#include "cmStateDirectory.h"
#include "cmStateTypes.h"
#include "cmVersion.h"
#include "cmake.h"
#include <algorithm>
#include <assert.h>
#include <cmsys/Directory.hxx>
#include <cmsys/FStream.hxx>
#include <iterator>
#include <sstream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#if defined(CMAKE_BUILD_WITH_CMAKE)
#include <cm_jsoncpp_value.h>
#include <cm_jsoncpp_writer.h>
......
......@@ -5,8 +5,15 @@
#include <cmConfigure.h>
#include <iosfwd>
#include <map>
#include <set>
#include <string>
#include <utility>
#include <vector>
#include "cmCustomCommandLines.h"
#include "cmExportSetMap.h"
#include "cmStateDirectory.h"
#include "cmStateSnapshot.h"
#include "cmSystemTools.h"
#include "cmTarget.h"
......@@ -14,26 +21,19 @@
#include "cm_codecvt.hxx"
#include "cm_unordered_map.hxx"
#include <iosfwd>
#include <map>
#include <set>
#include <string>
#include <utility>
#include <vector>
#if defined(CMAKE_BUILD_WITH_CMAKE)
#include "cmFileLockPool.h"
#endif
class cmCustomCommandLines;
class cmSourceFile;
class cmExportBuildFileGenerator;
class cmExternalMakefileProjectGenerator;
class cmGeneratorTarget;
class cmLocalGenerator;
class cmLinkLineComputer;
class cmLocalGenerator;
class cmMakefile;
class cmOutputConverter;
class cmSourceFile;
class cmStateDirectory;
class cmake;
/** \class cmGlobalGenerator
......
......@@ -5,12 +5,11 @@
#include <cmConfigure.h>
#include <cmConfigure.h>
#include "cmStandardIncludes.h"
#include <string>
#include <vector>
class cmake;
class cmGlobalGenerator;
class cmake;
struct cmDocumentationEntry;
/** \class cmGlobalGeneratorFactory
......
......@@ -2,6 +2,7 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmGlobalJOMMakefileGenerator.h"
#include "cmDocumentationEntry.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
#include "cmState.h"
......
......@@ -2,11 +2,13 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmGlobalMSYSMakefileGenerator.h"
#include <cmsys/FStream.hxx>
#include "cmDocumentationEntry.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
#include "cmState.h"
#include "cmake.h"
#include <cmsys/FStream.hxx>
cmGlobalMSYSMakefileGenerator::cmGlobalMSYSMakefileGenerator(cmake* cm)
: cmGlobalUnixMakefileGenerator3(cm)
......
......@@ -2,6 +2,7 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmGlobalMinGWMakefileGenerator.h"
#include "cmDocumentationEntry.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
#include "cmState.h"
......
......@@ -2,6 +2,7 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmGlobalNMakeMakefileGenerator.h"
#include "cmDocumentationEntry.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
#include "cmState.h"
......
......@@ -2,6 +2,17 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmGlobalNinjaGenerator.h"
#include <algorithm>
#include <cm_jsoncpp_reader.h>
#include <cm_jsoncpp_value.h>
#include <cm_jsoncpp_writer.h>
#include <cmsys/FStream.hxx>
#include <ctype.h>
#include <functional>
#include <iterator>
#include <sstream>
#include <stdio.h>
#include "cmAlgorithms.h"
#include "cmDocumentationEntry.h"
#include "cmFortranParser.h"
......@@ -13,6 +24,9 @@
#include "cmMakefile.h"
#include "cmNinjaLinkLineComputer.h"
#include "cmOutputConverter.h"
#include "cmState.h"
#include "cmStateDirectory.h"
#include "cmStateSnapshot.h"
#include "cmStateTypes.h"
#include "cmSystemTools.h"
#include "cmTarget.h"
......@@ -21,15 +35,7 @@
#include "cm_auto_ptr.hxx"
#include "cmake.h"
#include "cm_jsoncpp_reader.h"
#include "cm_jsoncpp_writer.h"
#include <algorithm>
#include <ctype.h>
#include <functional>
#include <iterator>
#include <sstream>
#include <stdio.h>
class cmLinkLineComputer;
const char* cmGlobalNinjaGenerator::NINJA_BUILD_FILE = "build.ninja";
const char* cmGlobalNinjaGenerator::NINJA_RULES_FILE = "rules.ninja";
......
......@@ -5,12 +5,6 @@
#include <cmConfigure.h>
#include "cmGlobalCommonGenerator.h"
#include "cmGlobalGenerator.h"
#include "cmGlobalGeneratorFactory.h"
#include "cmNinjaTypes.h"
#include "cmPolicies.h"
#include <iosfwd>
#include <map>
#include <set>
......@@ -18,13 +12,23 @@
#include <utility>
#include <vector>
#include "cmGlobalCommonGenerator.h"
#include "cmGlobalGenerator.h"
#include "cmGlobalGeneratorFactory.h"
#include "cmNinjaTypes.h"
#include "cmPolicies.h"
#include "cm_codecvt.hxx"
class cmCustomCommand;
class cmMakefile;
class cmake;
struct cmDocumentationEntry;
class cmGeneratedFileStream;
class cmGeneratorTarget;
class cmLinkLineComputer;
class cmLocalGenerator;
class cmMakefile;
class cmOutputConverter;
class cmStateDirectory;
class cmake;
struct cmDocumentationEntry;
/**
* \class cmGlobalNinjaGenerator
......
......@@ -2,6 +2,11 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmGlobalUnixMakefileGenerator3.h"
#include <algorithm>
#include <functional>
#include <sstream>
#include <utility>
#include "cmAlgorithms.h"
#include "cmDocumentationEntry.h"
#include "cmGeneratedFileStream.h"
......@@ -14,16 +19,12 @@
#include "cmOutputConverter.h"
#include "cmState.h"
#include "cmStateDirectory.h"
#include "cmStateTypes.h"
#include "cmSystemTools.h"
#include "cmTarget.h"
#include "cmTargetDepend.h"
#include "cmake.h"
#include <algorithm>
#include <functional>
#include <sstream>
#include <utility>
cmGlobalUnixMakefileGenerator3::cmGlobalUnixMakefileGenerator3(cmake* cm)
: cmGlobalCommonGenerator(cm)
{
......
......@@ -5,11 +5,6 @@
#include <cmConfigure.h>
#include "cmGeneratorTarget.h"
#include "cmGlobalCommonGenerator.h"
#include "cmGlobalGeneratorFactory.h"
#include "cmStateTypes.h"
#include <iosfwd>
#include <map>
#include <set>
......@@ -17,6 +12,11 @@
#include <string>
#include <vector>
#include "cmGeneratorTarget.h"
#include "cmGlobalCommonGenerator.h"
#include "cmGlobalGeneratorFactory.h"
#include "cmStateSnapshot.h"
class cmGeneratedFileStream;
class cmLocalGenerator;
class cmLocalUnixMakefileGenerator3;
......
......@@ -5,7 +5,6 @@
#include "cmDocumentationEntry.h"
#include "cmMakefile.h"
#include "cmState.h"
#include "cmStateTypes.h"
#include "cmake.h"
cmGlobalWatcomWMakeGenerator::cmGlobalWatcomWMakeGenerator(cmake* cm)
......
......@@ -3,9 +3,9 @@
#ifndef cmGraphAdjacencyList_h
#define cmGraphAdjacencyList_h
#include <cmConfigure.h>
#include <cmConfigure.h> // IWYU pragma: keep
#include "cmStandardIncludes.h"
#include <vector>
/**
* Graph edge representation. Most use cases just need the
......
......@@ -2,21 +2,22 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmGraphVizWriter.h"
#include <cmConfigure.h>
#include <iostream>
#include <sstream>
#include <utility>
#include "cmGeneratedFileStream.h"
#include "cmGeneratorTarget.h"
#include "cmGlobalGenerator.h"
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
#include "cmStateSnapshot.h"
#include "cmSystemTools.h"
#include "cmTarget.h"
#include "cm_auto_ptr.hxx"
#include "cmake.h"
#include <cmConfigure.h>
#include <iostream>
#include <sstream>
#include <utility>
static const char* getShapeForTarget(const cmGeneratorTarget* target)
{
if (!target) {
......
Markdown is supported
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