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,11 +2,12 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmHexFileConverter.h"
#include "cmSystemTools.h"
#include <cmConfigure.h>
#include <stdio.h>
#include <string.h>
#include "cmSystemTools.h"
#define INTEL_HEX_MIN_LINE_LENGTH (1 + 8 + 2)
#define INTEL_HEX_MAX_LINE_LENGTH (1 + 8 + (256 * 2) + 2)
#define MOTOROLA_SREC_MIN_LINE_LENGTH (2 + 2 + 4 + 2)
......
......@@ -3,10 +3,6 @@
#ifndef cmHexFileConverter_h
#define cmHexFileConverter_h
#include <cmConfigure.h>
#include "cmStandardIncludes.h"
/** \class cmHexFileConverter
* \brief Can detects Intel Hex and Motorola S-record files and convert them
* to binary files.
......
......@@ -2,7 +2,6 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmInstallCommand.h"
#include <algorithm>
#include <cmsys/Glob.hxx>
#include <sstream>
#include <stddef.h>
......
......@@ -2,6 +2,8 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmInstallCommandArguments.h"
#include <cmConfigure.h>
#include "cmSystemTools.h"
// Table of valid permissions.
......
......@@ -3,9 +3,10 @@
#ifndef cmInstallCommandArguments_h
#define cmInstallCommandArguments_h
#include <cmConfigure.h>
#include <cmConfigure.h> // IWYU pragma: keep
#include "cmStandardIncludes.h"
#include <string>
#include <vector>
#include "cmCommandArgumentsHelper.h"
......
......@@ -2,6 +2,12 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmInstallTargetGenerator.h"
#include <assert.h>
#include <map>
#include <set>
#include <sstream>
#include <utility>
#include "cmComputeLinkInformation.h"
#include "cmGeneratorExpression.h"
#include "cmGeneratorTarget.h"
......@@ -12,15 +18,8 @@
#include "cmStateTypes.h"
#include "cmSystemTools.h"
#include "cmTarget.h"
#include "cm_auto_ptr.hxx"
#include "cmake.h"
#include <assert.h>
#include <map>
#include <set>
#include <sstream>
#include <utility>
cmInstallTargetGenerator::cmInstallTargetGenerator(
const std::string& targetName, const char* dest, bool implib,
const char* file_permissions, std::vector<std::string> const& configurations,
......
......@@ -3,8 +3,16 @@
#ifndef cmLinkItem_h
#define cmLinkItem_h
#include <cmConfigure.h>
#include <algorithm>
#include <map>
#include <string>
#include <vector>
#include "cmListFileCache.h"
#include "cmSystemTools.h"
#include "cmTargetLinkLibraryType.h"
class cmGeneratorTarget;
......
......@@ -2,10 +2,15 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmLinkLineComputer.h"
#include <sstream>
#include <vector>
#include "cmComputeLinkInformation.h"
#include "cmGeneratorTarget.h"
#include "cmOutputConverter.h"
#include "cmStateDirectory.h"
#include "cmStateTypes.h"
cmLinkLineComputer::cmLinkLineComputer(cmOutputConverter* outputConverter,
cmStateDirectory stateDir)
......
......@@ -4,6 +4,10 @@
#ifndef cmLinkLineComputer_h
#define cmLinkLineComputer_h
#include <cmConfigure.h> // IWYU pragma: keep
#include <string>
#include "cmStateDirectory.h"
class cmComputeLinkInformation;
......
......@@ -5,9 +5,9 @@
#include <cmConfigure.h>
#include "cmStandardIncludes.h"
#include <assert.h>
#include <iterator>
#include <vector>
/**
@brief A adaptor for traversing a tree structure in a vector
......
......@@ -2,10 +2,11 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmLocalCommonGenerator.h"
#include <vector>
#include "cmGeneratorTarget.h"
#include "cmMakefile.h"
#include <vector>
#include "cmOutputConverter.h"
class cmGlobalGenerator;
......
......@@ -5,11 +5,10 @@
#include <cmConfigure.h>
#include "cmLocalGenerator.h"
#include "cmOutputConverter.h"
#include <string>
#include "cmLocalGenerator.h"
class cmGeneratorTarget;
class cmGlobalGenerator;
class cmMakefile;
......
......@@ -18,6 +18,7 @@
#include "cmSourceFile.h"
#include "cmState.h"
#include "cmStateDirectory.h"
#include "cmStateTypes.h"
#include "cmSystemTools.h"
#include "cmTarget.h"
#include "cmTestGenerator.h"
......@@ -32,10 +33,10 @@
#include <algorithm>
#include <assert.h>
#include <cmsys/RegularExpression.hxx>
#include <ctype.h>
#include <iterator>
#include <sstream>
#include <stdio.h>
#include <string.h>
#include <utility>
#if defined(__HAIKU__)
......
......@@ -5,29 +5,28 @@
#include <cmConfigure.h>
#include "cmListFileCache.h"
#include "cmOutputConverter.h"
#include "cmPolicies.h"
#include "cmRulePlaceholderExpander.h"
#include "cmStateTypes.h"
#include "cmake.h"
#include <cm_kwiml.h>
#include <iosfwd>
#include <map>
#include <set>
#include <string.h>
#include <string>
#include <vector>
#include "cmListFileCache.h"
#include "cmOutputConverter.h"
#include "cmPolicies.h"
#include "cmStateSnapshot.h"
#include "cmake.h"
class cmComputeLinkInformation;
class cmCustomCommandGenerator;
class cmGeneratorTarget;
class cmGlobalGenerator;
class cmRulePlaceholderExpander;
class cmLinkLineComputer;
class cmMakefile;
class cmRulePlaceholderExpander;
class cmSourceFile;
class cmLinkLineComputer;
class cmState;
/** \class cmLocalGenerator
* \brief Create required build files for a directory.
......
......@@ -2,6 +2,13 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmLocalNinjaGenerator.h"
#include <algorithm>
#include <assert.h>
#include <iterator>
#include <sstream>
#include <stdio.h>
#include <utility>
#include "cmCustomCommand.h"
#include "cmCustomCommandGenerator.h"
#include "cmGeneratedFileStream.h"
......@@ -15,15 +22,9 @@
#include "cmState.h"
#include "cmStateTypes.h"
#include "cmSystemTools.h"
#include "cm_auto_ptr.hxx"
#include "cmake.h"
#include <algorithm>
#include <assert.h>
#include <iterator>
#include <sstream>
#include <stdio.h>
#include <utility>
cmLocalNinjaGenerator::cmLocalNinjaGenerator(cmGlobalGenerator* gg,
cmMakefile* mf)
: cmLocalCommonGenerator(gg, mf, mf->GetState()->GetBinaryDirectory())
......
......@@ -5,17 +5,16 @@
#include <cmConfigure.h>
#include "cmLocalCommonGenerator.h"
#include "cmLocalGenerator.h"
#include "cmNinjaTypes.h"
#include "cmOutputConverter.h"
#include <iosfwd>
#include <map>
#include <set>
#include <string>
#include <vector>
#include "cmLocalCommonGenerator.h"
#include "cmNinjaTypes.h"
#include "cmOutputConverter.h"
class cmCustomCommand;
class cmCustomCommandGenerator;
class cmGeneratedFileStream;
......@@ -23,6 +22,7 @@ class cmGeneratorTarget;
class cmGlobalGenerator;
class cmGlobalNinjaGenerator;
class cmMakefile;
class cmRulePlaceholderExpander;
class cmSourceFile;
class cmake;
......
......@@ -2,6 +2,14 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmLocalUnixMakefileGenerator3.h"
#include <algorithm>
#include <cmsys/FStream.hxx>
#include <cmsys/Terminal.h>
#include <functional>
#include <sstream>
#include <stdio.h>
#include <utility>
#include "cmAlgorithms.h"
#include "cmCustomCommand.h"
#include "cmCustomCommandGenerator.h"
......@@ -18,9 +26,11 @@
#include "cmSourceFile.h"
#include "cmState.h"
#include "cmStateDirectory.h"
#include "cmStateSnapshot.h"
#include "cmStateTypes.h"
#include "cmSystemTools.h"
#include "cmVersion.h"
#include "cm_auto_ptr.hxx"
#include "cmake.h"
// Include dependency scanners for supported languages. Only the
......@@ -31,15 +41,6 @@
#include "cmDependsJava.h"
#endif
#include <algorithm>
#include <cm_auto_ptr.hxx>
#include <cmsys/FStream.hxx>
#include <cmsys/Terminal.h>
#include <functional>
#include <sstream>
#include <stdio.h>
#include <utility>
// Escape special characters in Makefile dependency lines
class cmMakeSafe
{
......
......@@ -5,8 +5,6 @@
#include <cmConfigure.h>
#include "cmStandardIncludes.h"
#include <locale.h>
class cmLocaleRAII
......
......@@ -3,7 +3,13 @@
#include "cmMSVC60LinkLineComputer.h"
#include "cmStateDirectory.h"
#if defined(_WIN32) && !defined(__CYGWIN__)
#include "cmSystemTools.h"
#endif
class cmOutputConverter;
cmMSVC60LinkLineComputer::cmMSVC60LinkLineComputer(
cmOutputConverter* outputConverter, cmStateDirectory stateDir)
......
......@@ -4,8 +4,15 @@
#ifndef cmMSVC60LinkLineComputer_h
#define cmMSVC60LinkLineComputer_h
#include <cmConfigure.h>
#include <string>
#include "cmLinkLineComputer.h"
class cmOutputConverter;
class cmStateDirectory;
class cmMSVC60LinkLineComputer : public cmLinkLineComputer
{
public:
......
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