diff options
43 files changed, 315 insertions, 53 deletions
diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx index b7bac9c..5503619 100644 --- a/Source/cmGlobalBorlandMakefileGenerator.cxx +++ b/Source/cmGlobalBorlandMakefileGenerator.cxx @@ -2,14 +2,16 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalBorlandMakefileGenerator.h" +#include <ostream> #include <utility> #include <cm/memory> #include "cmDocumentationEntry.h" +#include "cmGlobalGenerator.h" +#include "cmLocalGenerator.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" -#include "cmMessageType.h" #include "cmState.h" #include "cmake.h" diff --git a/Source/cmGlobalBorlandMakefileGenerator.h b/Source/cmGlobalBorlandMakefileGenerator.h index 5a4e8c2..646dfff 100644 --- a/Source/cmGlobalBorlandMakefileGenerator.h +++ b/Source/cmGlobalBorlandMakefileGenerator.h @@ -4,8 +4,16 @@ #include <iosfwd> #include <memory> +#include <string> +#include <vector> -#include "cmGlobalNMakeMakefileGenerator.h" +#include "cmGlobalGeneratorFactory.h" +#include "cmGlobalUnixMakefileGenerator3.h" + +class cmLocalGenerator; +class cmMakefile; +class cmake; +struct cmDocumentationEntry; /** \class cmGlobalBorlandMakefileGenerator * \brief Write a Borland makefiles. diff --git a/Source/cmGlobalJOMMakefileGenerator.cxx b/Source/cmGlobalJOMMakefileGenerator.cxx index 40deebb..1b406a6 100644 --- a/Source/cmGlobalJOMMakefileGenerator.cxx +++ b/Source/cmGlobalJOMMakefileGenerator.cxx @@ -2,8 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalJOMMakefileGenerator.h" +#include <ostream> + +#include <cmext/algorithm> + #include "cmDocumentationEntry.h" -#include "cmLocalUnixMakefileGenerator3.h" +#include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmState.h" #include "cmake.h" diff --git a/Source/cmGlobalJOMMakefileGenerator.h b/Source/cmGlobalJOMMakefileGenerator.h index 58860dd..8229745 100644 --- a/Source/cmGlobalJOMMakefileGenerator.h +++ b/Source/cmGlobalJOMMakefileGenerator.h @@ -4,8 +4,16 @@ #include <iosfwd> #include <memory> +#include <string> +#include <vector> +#include "cmGlobalGeneratorFactory.h" #include "cmGlobalUnixMakefileGenerator3.h" +#include "cmValue.h" + +class cmMakefile; +class cmake; +struct cmDocumentationEntry; /** \class cmGlobalJOMMakefileGenerator * \brief Write a JOM makefiles. diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx index ae9d5a7..c8520b8 100644 --- a/Source/cmGlobalMSYSMakefileGenerator.cxx +++ b/Source/cmGlobalMSYSMakefileGenerator.cxx @@ -5,10 +5,10 @@ #include "cmsys/FStream.hxx" #include "cmDocumentationEntry.h" -#include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" -#include "cmMessageType.h" #include "cmState.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" #include "cmake.h" cmGlobalMSYSMakefileGenerator::cmGlobalMSYSMakefileGenerator(cmake* cm) diff --git a/Source/cmGlobalMSYSMakefileGenerator.h b/Source/cmGlobalMSYSMakefileGenerator.h index 1a47b4f..586487f 100644 --- a/Source/cmGlobalMSYSMakefileGenerator.h +++ b/Source/cmGlobalMSYSMakefileGenerator.h @@ -3,9 +3,16 @@ #pragma once #include <memory> +#include <string> +#include <vector> +#include "cmGlobalGeneratorFactory.h" #include "cmGlobalUnixMakefileGenerator3.h" +class cmMakefile; +class cmake; +struct cmDocumentationEntry; + /** \class cmGlobalMSYSMakefileGenerator * \brief Write a NMake makefiles. * diff --git a/Source/cmGlobalMinGWMakefileGenerator.cxx b/Source/cmGlobalMinGWMakefileGenerator.cxx index d9fc505..54d048d 100644 --- a/Source/cmGlobalMinGWMakefileGenerator.cxx +++ b/Source/cmGlobalMinGWMakefileGenerator.cxx @@ -3,9 +3,9 @@ #include "cmGlobalMinGWMakefileGenerator.h" #include "cmDocumentationEntry.h" -#include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" #include "cmState.h" +#include "cmSystemTools.h" #include "cmake.h" cmGlobalMinGWMakefileGenerator::cmGlobalMinGWMakefileGenerator(cmake* cm) diff --git a/Source/cmGlobalMinGWMakefileGenerator.h b/Source/cmGlobalMinGWMakefileGenerator.h index ffc9ebe..1574faf 100644 --- a/Source/cmGlobalMinGWMakefileGenerator.h +++ b/Source/cmGlobalMinGWMakefileGenerator.h @@ -3,9 +3,16 @@ #pragma once #include <memory> +#include <string> +#include <vector> +#include "cmGlobalGeneratorFactory.h" #include "cmGlobalUnixMakefileGenerator3.h" +class cmMakefile; +class cmake; +struct cmDocumentationEntry; + /** \class cmGlobalMinGWMakefileGenerator * \brief Write a NMake makefiles. * diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx index a038f87..9f3d30e 100644 --- a/Source/cmGlobalNMakeMakefileGenerator.cxx +++ b/Source/cmGlobalNMakeMakefileGenerator.cxx @@ -2,13 +2,20 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalNMakeMakefileGenerator.h" +#include <ostream> + +#include <cmext/algorithm> + #include "cmsys/RegularExpression.hxx" #include "cmDocumentationEntry.h" #include "cmDuration.h" -#include "cmLocalUnixMakefileGenerator3.h" +#include "cmGlobalGenerator.h" #include "cmMakefile.h" +#include "cmMessageType.h" #include "cmState.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" #include "cmake.h" cmGlobalNMakeMakefileGenerator::cmGlobalNMakeMakefileGenerator(cmake* cm) diff --git a/Source/cmGlobalNMakeMakefileGenerator.h b/Source/cmGlobalNMakeMakefileGenerator.h index 4f202b5..ca5b8d6 100644 --- a/Source/cmGlobalNMakeMakefileGenerator.h +++ b/Source/cmGlobalNMakeMakefileGenerator.h @@ -4,8 +4,18 @@ #include <iosfwd> #include <memory> +#include <string> +#include <vector> +#include "cm_codecvt.hxx" + +#include "cmGlobalGeneratorFactory.h" #include "cmGlobalUnixMakefileGenerator3.h" +#include "cmValue.h" + +class cmMakefile; +class cmake; +struct cmDocumentationEntry; /** \class cmGlobalNMakeMakefileGenerator * \brief Write a NMake makefiles. diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 6cab492..d7bc05d 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -3,24 +3,35 @@ #include "cmGlobalVisualStudio10Generator.h" #include <algorithm> +#include <cstring> +#include <map> +#include <sstream> #include <utility> #include <cm/memory> #include <cm3p/json/reader.h> +#include <cm3p/json/value.h> #include "cmsys/FStream.hxx" #include "cmsys/Glob.hxx" #include "cmsys/RegularExpression.hxx" -#include "cmAlgorithms.h" #include "cmDocumentationEntry.h" #include "cmGeneratorTarget.h" +#include "cmGlobalGenerator.h" +#include "cmGlobalGeneratorFactory.h" +#include "cmGlobalVisualStudio71Generator.h" +#include "cmGlobalVisualStudio7Generator.h" +#include "cmGlobalVisualStudioGenerator.h" +#include "cmIDEFlagTable.h" +#include "cmLocalGenerator.h" #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" #include "cmMessageType.h" #include "cmSourceFile.h" #include "cmStringAlgorithms.h" +#include "cmSystemTools.h" #include "cmVersion.h" #include "cmVisualStudioSlnData.h" #include "cmVisualStudioSlnParser.h" diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index 6e62390..c8fd149 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -2,14 +2,25 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #pragma once +#include <cstddef> #include <memory> #include <set> +#include <string> +#include <vector> #include <cm/optional> #include <cm/string_view> #include "cmGlobalVisualStudio8Generator.h" +class cmGeneratorTarget; +class cmGlobalGeneratorFactory; +class cmLocalGenerator; +class cmMakefile; +class cmSourceFile; +class cmake; +struct cmIDEFlagTable; + /** \class cmGlobalVisualStudio10Generator * \brief Write a Unix makefiles. * diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx index a5ffcf0..6126cb4 100644 --- a/Source/cmGlobalVisualStudio11Generator.cxx +++ b/Source/cmGlobalVisualStudio11Generator.cxx @@ -2,12 +2,19 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalVisualStudio11Generator.h" +#include <cstring> +#include <sstream> #include <utility> +#include <vector> -#include "cmAlgorithms.h" #include "cmDocumentationEntry.h" -#include "cmLocalVisualStudio10Generator.h" +#include "cmGlobalGenerator.h" +#include "cmGlobalGeneratorFactory.h" +#include "cmGlobalVisualStudioGenerator.h" #include "cmMakefile.h" +#include "cmMessageType.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" static const char vs11generatorName[] = "Visual Studio 11 2012"; diff --git a/Source/cmGlobalVisualStudio11Generator.h b/Source/cmGlobalVisualStudio11Generator.h index b11905e..2f8a7f6 100644 --- a/Source/cmGlobalVisualStudio11Generator.h +++ b/Source/cmGlobalVisualStudio11Generator.h @@ -4,13 +4,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include <iosfwd> #include <memory> #include <set> #include <string> +#include <cm/optional> + #include "cmGlobalVisualStudio10Generator.h" -#include "cmStateTypes.h" +#include "cmTransformDepfile.h" class cmGlobalGeneratorFactory; class cmMakefile; diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx index 8bdf356..d8c1b43 100644 --- a/Source/cmGlobalVisualStudio12Generator.cxx +++ b/Source/cmGlobalVisualStudio12Generator.cxx @@ -2,10 +2,18 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalVisualStudio12Generator.h" -#include "cmAlgorithms.h" +#include <cstring> +#include <sstream> +#include <vector> + #include "cmDocumentationEntry.h" -#include "cmLocalVisualStudio10Generator.h" +#include "cmGlobalGenerator.h" +#include "cmGlobalGeneratorFactory.h" +#include "cmGlobalVisualStudioGenerator.h" #include "cmMakefile.h" +#include "cmMessageType.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" static const char vs12generatorName[] = "Visual Studio 12 2013"; diff --git a/Source/cmGlobalVisualStudio12Generator.h b/Source/cmGlobalVisualStudio12Generator.h index c220d40..a84756e 100644 --- a/Source/cmGlobalVisualStudio12Generator.h +++ b/Source/cmGlobalVisualStudio12Generator.h @@ -4,7 +4,6 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include <iosfwd> #include <memory> #include <string> diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx index ff1642f..014668f 100644 --- a/Source/cmGlobalVisualStudio14Generator.cxx +++ b/Source/cmGlobalVisualStudio14Generator.cxx @@ -2,11 +2,20 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalVisualStudio14Generator.h" +#include <cstring> +#include <sstream> + #include <cm/vector> #include "cmDocumentationEntry.h" -#include "cmLocalVisualStudio10Generator.h" +#include "cmGlobalGenerator.h" +#include "cmGlobalGeneratorFactory.h" +#include "cmGlobalVisualStudioGenerator.h" #include "cmMakefile.h" +#include "cmMessageType.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" +#include "cmValue.h" static const char vs14generatorName[] = "Visual Studio 14 2015"; diff --git a/Source/cmGlobalVisualStudio14Generator.h b/Source/cmGlobalVisualStudio14Generator.h index 7804b83..7fb9b4b 100644 --- a/Source/cmGlobalVisualStudio14Generator.h +++ b/Source/cmGlobalVisualStudio14Generator.h @@ -4,7 +4,6 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include <iosfwd> #include <memory> #include <string> diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx index 50975ff..ce943a2 100644 --- a/Source/cmGlobalVisualStudio71Generator.cxx +++ b/Source/cmGlobalVisualStudio71Generator.cxx @@ -2,11 +2,19 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalVisualStudio71Generator.h" -#include "cmDocumentationEntry.h" +#include <map> +#include <sstream> + #include "cmGeneratorTarget.h" -#include "cmLocalVisualStudio7Generator.h" +#include "cmGlobalGenerator.h" +#include "cmGlobalVisualStudioGenerator.h" +#include "cmListFileCache.h" +#include "cmLocalGenerator.h" #include "cmMakefile.h" -#include "cmMessageType.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" + +class cmake; cmGlobalVisualStudio71Generator::cmGlobalVisualStudio71Generator( cmake* cm, const std::string& platformName) diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h index cb3b8c1..0e7ddd0 100644 --- a/Source/cmGlobalVisualStudio71Generator.h +++ b/Source/cmGlobalVisualStudio71Generator.h @@ -2,7 +2,20 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #pragma once +#include <iosfwd> +#include <set> +#include <string> +#include <utility> +#include <vector> + #include "cmGlobalVisualStudio7Generator.h" +#include "cmValue.h" + +class cmGeneratorTarget; +class cmLocalGenerator; +class cmake; +template <typename T> +class BT; /** \class cmGlobalVisualStudio71Generator * \brief Write a Unix makefiles. diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index 58b24fc..b3f8d90 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -2,7 +2,9 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalVisualStudio7Generator.h" -#include <cassert> +#include <algorithm> +#include <cstdio> +#include <ostream> #include <utility> #include <vector> @@ -11,17 +13,22 @@ #include <windows.h> -#include "cmsys/Encoding.hxx" - #include "cmGeneratedFileStream.h" #include "cmGeneratorExpression.h" #include "cmGeneratorTarget.h" +#include "cmGlobalGenerator.h" +#include "cmLocalGenerator.h" #include "cmLocalVisualStudio7Generator.h" #include "cmMakefile.h" #include "cmMessageType.h" #include "cmState.h" +#include "cmStateTypes.h" #include "cmStringAlgorithms.h" +#include "cmSystemTools.h" +#include "cmTarget.h" +#include "cmTargetDepend.h" #include "cmUuid.h" +#include "cmVisualStudioGeneratorOptions.h" #include "cmake.h" static cmVS7FlagTable cmVS7ExtraFlagTable[] = { diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h index 8e762cf..d1fb804 100644 --- a/Source/cmGlobalVisualStudio7Generator.h +++ b/Source/cmGlobalVisualStudio7Generator.h @@ -2,14 +2,26 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #pragma once +#include <iosfwd> +#include <map> #include <memory> +#include <set> +#include <string> +#include <utility> +#include <vector> + +#include <cm3p/json/value.h> -#include "cmGlobalGeneratorFactory.h" #include "cmGlobalVisualStudioGenerator.h" #include "cmValue.h" -class cmTarget; +class cmGeneratorTarget; struct cmIDEFlagTable; +class cmLocalGenerator; +class cmMakefile; +class cmake; +template <typename T> +class BT; /** \class cmGlobalVisualStudio7Generator * \brief Write a Unix makefiles. diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index 48c662c..4e53dff 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -2,22 +2,41 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalVisualStudio8Generator.h" +#include <algorithm> +#include <functional> +#include <ostream> +#include <utility> + #include <cm/memory> +#include <cmext/algorithm> #include <cmext/memory> #include "cmCustomCommand.h" #include "cmCustomCommandLines.h" -#include "cmDocumentationEntry.h" +#include "cmCustomCommandTypes.h" #include "cmGeneratedFileStream.h" #include "cmGeneratorExpression.h" #include "cmGeneratorTarget.h" +#include "cmGlobalGenerator.h" +#include "cmGlobalVisualStudio7Generator.h" +#include "cmGlobalVisualStudioGenerator.h" +#include "cmListFileCache.h" +#include "cmLocalGenerator.h" #include "cmLocalVisualStudio7Generator.h" #include "cmMakefile.h" -#include "cmMessageType.h" +#include "cmPolicies.h" #include "cmSourceFile.h" -#include "cmVisualStudioWCEPlatformParser.h" +#include "cmStateTypes.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" +#include "cmTarget.h" +#include "cmTargetDepend.h" +#include "cmValue.h" +#include "cmVisualStudioGeneratorOptions.h" #include "cmake.h" +struct cmIDEFlagTable; + cmGlobalVisualStudio8Generator::cmGlobalVisualStudio8Generator( cmake* cm, const std::string& name, std::string const& platformInGeneratorName) diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h index b6ecdf0..fe57c54 100644 --- a/Source/cmGlobalVisualStudio8Generator.h +++ b/Source/cmGlobalVisualStudio8Generator.h @@ -2,10 +2,20 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #pragma once +#include <iosfwd> +#include <set> +#include <string> +#include <vector> + #include <cm/optional> #include "cmGlobalVisualStudio71Generator.h" +class cmGeneratorTarget; +class cmMakefile; +class cmake; +struct cmIDEFlagTable; + /** \class cmGlobalVisualStudio8Generator * \brief Write a Unix makefiles. * diff --git a/Source/cmGlobalVisualStudio9Generator.cxx b/Source/cmGlobalVisualStudio9Generator.cxx index 2339a80..5f867f5 100644 --- a/Source/cmGlobalVisualStudio9Generator.cxx +++ b/Source/cmGlobalVisualStudio9Generator.cxx @@ -2,14 +2,19 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalVisualStudio9Generator.h" +#include <cstring> #include <utility> +#include <vector> #include "cmDocumentationEntry.h" -#include "cmLocalVisualStudio7Generator.h" -#include "cmMakefile.h" -#include "cmMessageType.h" +#include "cmGlobalGenerator.h" +#include "cmGlobalGeneratorFactory.h" +#include "cmGlobalVisualStudioGenerator.h" +#include "cmSystemTools.h" #include "cmVisualStudioWCEPlatformParser.h" +class cmake; + static const char vs9generatorName[] = "Visual Studio 9 2008"; class cmGlobalVisualStudio9Generator::Factory : public cmGlobalGeneratorFactory diff --git a/Source/cmGlobalVisualStudio9Generator.h b/Source/cmGlobalVisualStudio9Generator.h index 6f4d159..1c93d49 100644 --- a/Source/cmGlobalVisualStudio9Generator.h +++ b/Source/cmGlobalVisualStudio9Generator.h @@ -3,9 +3,13 @@ #pragma once #include <memory> +#include <string> #include "cmGlobalVisualStudio8Generator.h" +class cmGlobalGeneratorFactory; +class cmake; + /** \class cmGlobalVisualStudio9Generator * \brief Write a Unix makefiles. * diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index f6011d1..948fa53 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -3,8 +3,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalVisualStudioGenerator.h" +#include <cassert> #include <future> #include <iostream> +#include <sstream> +#include <system_error> +#include <utility> #include <cm/iterator> #include <cm/memory> @@ -14,17 +18,20 @@ #include <objbase.h> #include <shellapi.h> -#include "cmsys/Encoding.hxx" - #include "cmCallVisualStudioMacro.h" #include "cmCustomCommand.h" #include "cmCustomCommandLines.h" #include "cmGeneratedFileStream.h" #include "cmGeneratorTarget.h" -#include "cmLocalVisualStudioGenerator.h" +#include "cmLocalGenerator.h" #include "cmMakefile.h" +#include "cmMessageType.h" +#include "cmPolicies.h" #include "cmSourceFile.h" #include "cmState.h" +#include "cmStateTypes.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" #include "cmTarget.h" #include "cmake.h" diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h index 23c8a02..1eff135 100644 --- a/Source/cmGlobalVisualStudioGenerator.h +++ b/Source/cmGlobalVisualStudioGenerator.h @@ -10,8 +10,11 @@ #include <string> #include <vector> +#include "cm_codecvt.hxx" + #include "cmGlobalGenerator.h" #include "cmTargetDepend.h" +#include "cmValue.h" class cmCustomCommand; class cmGeneratorTarget; diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx index be7f149..ef8fee1 100644 --- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx +++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx @@ -2,17 +2,26 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalVisualStudioVersionedGenerator.h" +#include <cstring> +#include <set> +#include <sstream> +#include <utility> +#include <vector> + #include <cmext/string_view> #include "cmsys/FStream.hxx" #include "cmsys/Glob.hxx" #include "cmsys/RegularExpression.hxx" -#include "cmAlgorithms.h" #include "cmDocumentationEntry.h" -#include "cmLocalVisualStudio10Generator.h" +#include "cmGlobalGenerator.h" +#include "cmGlobalGeneratorFactory.h" #include "cmMakefile.h" +#include "cmMessageType.h" +#include "cmStateTypes.h" #include "cmStringAlgorithms.h" +#include "cmSystemTools.h" #include "cmVSSetupHelper.h" #include "cmake.h" diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.h b/Source/cmGlobalVisualStudioVersionedGenerator.h index 54c38d9..2e573ec 100644 --- a/Source/cmGlobalVisualStudioVersionedGenerator.h +++ b/Source/cmGlobalVisualStudioVersionedGenerator.h @@ -4,16 +4,18 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include <iosfwd> #include <memory> #include <string> #include <cm/optional> +#include "cmGlobalVisualStudio10Generator.h" #include "cmGlobalVisualStudio14Generator.h" +#include "cmGlobalVisualStudioGenerator.h" #include "cmVSSetupHelper.h" class cmGlobalGeneratorFactory; +class cmMakefile; class cmake; /** \class cmGlobalVisualStudioVersionedGenerator */ diff --git a/Source/cmIDEOptions.cxx b/Source/cmIDEOptions.cxx index c476d47..c09aa46 100644 --- a/Source/cmIDEOptions.cxx +++ b/Source/cmIDEOptions.cxx @@ -2,14 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmIDEOptions.h" +#include <algorithm> #include <cstring> #include <iterator> +#include <utility> #include <cmext/algorithm> #include "cmsys/String.h" -#include "cmAlgorithms.h" #include "cmIDEFlagTable.h" #include "cmStringAlgorithms.h" diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx index 3ed49a0..4c0d2eea 100644 --- a/Source/cmLocalVisualStudio10Generator.cxx +++ b/Source/cmLocalVisualStudio10Generator.cxx @@ -2,18 +2,19 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmLocalVisualStudio10Generator.h" -#include <cmext/algorithm> - #include <cm3p/expat.h> -#include "cmAlgorithms.h" -#include "cmGeneratorTarget.h" +#include "cmGlobalGenerator.h" #include "cmGlobalVisualStudio10Generator.h" -#include "cmMakefile.h" +#include "cmGlobalVisualStudioGenerator.h" +#include "cmStateTypes.h" +#include "cmStringAlgorithms.h" #include "cmVisualStudio10TargetGenerator.h" #include "cmXMLParser.h" #include "cmake.h" +class cmGeneratorTarget; + class cmVS10XMLParser : public cmXMLParser { public: diff --git a/Source/cmLocalVisualStudio10Generator.h b/Source/cmLocalVisualStudio10Generator.h index 45ee082..75fe262 100644 --- a/Source/cmLocalVisualStudio10Generator.h +++ b/Source/cmLocalVisualStudio10Generator.h @@ -8,6 +8,7 @@ #include "cmLocalVisualStudio7Generator.h" +class cmGeneratorTarget; class cmGlobalGenerator; class cmMakefile; diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 886a4e8..d5b0c54 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -2,7 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmLocalVisualStudio7Generator.h" -#include <cctype> // for isspace +#include <algorithm> +#include <cassert> +#include <cstring> +#include <functional> +#include <sstream> +#include <utility> #include <cm/memory> #include <cmext/algorithm> @@ -11,18 +16,30 @@ #include <cm3p/expat.h> +#include "cmsys/FStream.hxx" + #include "cmComputeLinkInformation.h" #include "cmCustomCommand.h" #include "cmCustomCommandGenerator.h" +#include "cmCustomCommandLines.h" #include "cmGeneratedFileStream.h" #include "cmGeneratorExpression.h" #include "cmGeneratorTarget.h" +#include "cmGlobalGenerator.h" #include "cmGlobalVisualStudio7Generator.h" +#include "cmGlobalVisualStudioGenerator.h" +#include "cmListFileCache.h" #include "cmMakefile.h" -#include "cmMessageType.h" +#include "cmOutputConverter.h" +#include "cmPolicies.h" #include "cmSourceFile.h" +#include "cmSourceGroup.h" +#include "cmStateTypes.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" +#include "cmTarget.h" +#include "cmTargetDepend.h" +#include "cmValue.h" #include "cmXMLParser.h" #include "cmake.h" diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h index 6e06c09..d95ebc2 100644 --- a/Source/cmLocalVisualStudio7Generator.h +++ b/Source/cmLocalVisualStudio7Generator.h @@ -5,7 +5,9 @@ #include "cmConfigure.h" // IWYU pragma: keep #include <iosfwd> +#include <map> #include <memory> +#include <set> #include <string> #include <vector> diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx index 3e23f35..e57163e 100644 --- a/Source/cmLocalVisualStudioGenerator.cxx +++ b/Source/cmLocalVisualStudioGenerator.cxx @@ -2,15 +2,21 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmLocalVisualStudioGenerator.h" +#include <utility> + #include "windows.h" #include "cmCustomCommand.h" #include "cmCustomCommandGenerator.h" +#include "cmCustomCommandLines.h" #include "cmGeneratorTarget.h" #include "cmGlobalGenerator.h" #include "cmMakefile.h" +#include "cmOutputConverter.h" #include "cmSourceFile.h" +#include "cmStateTypes.h" #include "cmSystemTools.h" +#include "cmValue.h" cmLocalVisualStudioGenerator::cmLocalVisualStudioGenerator( cmGlobalGenerator* gg, cmMakefile* mf) diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index cd4326f..e9ff758 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2,8 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmVisualStudio10TargetGenerator.h" +#include <algorithm> +#include <cstdio> +#include <cstring> #include <iterator> #include <set> +#include <sstream> #include <cm/memory> #include <cm/optional> @@ -13,22 +17,41 @@ #include "windows.h" +#include "cmsys/FStream.hxx" +#include "cmsys/RegularExpression.hxx" + #include "cmComputeLinkInformation.h" #include "cmCustomCommand.h" #include "cmCustomCommandGenerator.h" #include "cmGeneratedFileStream.h" #include "cmGeneratorExpression.h" #include "cmGeneratorTarget.h" +#include "cmGlobalGenerator.h" #include "cmGlobalVisualStudio10Generator.h" -#include "cmGlobalVisualStudioVersionedGenerator.h" +#include "cmGlobalVisualStudio7Generator.h" +#include "cmGlobalVisualStudioGenerator.h" #include "cmLinkLineDeviceComputer.h" +#include "cmListFileCache.h" +#include "cmLocalGenerator.h" #include "cmLocalVisualStudio10Generator.h" +#include "cmLocalVisualStudio7Generator.h" +#include "cmLocalVisualStudioGenerator.h" #include "cmMakefile.h" +#include "cmMessageType.h" +#include "cmPropertyMap.h" #include "cmSourceFile.h" +#include "cmSourceFileLocation.h" +#include "cmSourceFileLocationKind.h" +#include "cmSourceGroup.h" +#include "cmStateTypes.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" +#include "cmTarget.h" +#include "cmValue.h" #include "cmVisualStudioGeneratorOptions.h" +struct cmIDEFlagTable; + static void ConvertToWindowsSlash(std::string& s); static std::string cmVS10EscapeXML(std::string arg) diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h index a5ce5e5..e4b48c3 100644 --- a/Source/cmVisualStudio10TargetGenerator.h +++ b/Source/cmVisualStudio10TargetGenerator.h @@ -4,12 +4,13 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include <iosfwd> +#include <cstddef> #include <map> #include <memory> #include <set> #include <string> #include <unordered_map> +#include <utility> #include <vector> #include "cmGeneratorTarget.h" @@ -17,7 +18,6 @@ class cmComputeLinkInformation; class cmCustomCommand; class cmCustomCommandGenerator; -class cmGeneratedFileStream; class cmGlobalVisualStudio10Generator; class cmLocalVisualStudio10Generator; class cmMakefile; diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx index 058ffb4..e495db0 100644 --- a/Source/cmVisualStudioGeneratorOptions.cxx +++ b/Source/cmVisualStudioGeneratorOptions.cxx @@ -1,12 +1,18 @@ #include "cmVisualStudioGeneratorOptions.h" +#include <algorithm> +#include <map> +#include <sstream> +#include <utility> +#include <vector> + #include <cm/iterator> #include "cmAlgorithms.h" -#include "cmGeneratorExpression.h" -#include "cmGeneratorTarget.h" #include "cmLocalVisualStudioGenerator.h" #include "cmOutputConverter.h" +#include "cmRange.h" +#include "cmStringAlgorithms.h" #include "cmSystemTools.h" static void cmVS10EscapeForMSBuild(std::string& ret) diff --git a/Source/cmVisualStudioGeneratorOptions.h b/Source/cmVisualStudioGeneratorOptions.h index b123019..ed4ee1d 100644 --- a/Source/cmVisualStudioGeneratorOptions.h +++ b/Source/cmVisualStudioGeneratorOptions.h @@ -12,7 +12,6 @@ #include "cmIDEOptions.h" class cmLocalVisualStudioGenerator; -class cmGeneratorTarget; using cmVS7FlagTable = cmIDEFlagTable; diff --git a/Source/cmVisualStudioSlnData.cxx b/Source/cmVisualStudioSlnData.cxx index 48112dd..8d4b658 100644 --- a/Source/cmVisualStudioSlnData.cxx +++ b/Source/cmVisualStudioSlnData.cxx @@ -2,6 +2,9 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmVisualStudioSlnData.h" +#include <cstddef> +#include <utility> + const cmSlnProjectEntry* cmSlnData::GetProjectByGUID( const std::string& projectGUID) const { diff --git a/Source/cmVisualStudioSlnParser.cxx b/Source/cmVisualStudioSlnParser.cxx index d7822b1..d900a95 100644 --- a/Source/cmVisualStudioSlnParser.cxx +++ b/Source/cmVisualStudioSlnParser.cxx @@ -3,12 +3,14 @@ #include "cmVisualStudioSlnParser.h" #include <cassert> +#include <memory> #include <stack> +#include <utility> +#include <vector> #include "cmsys/FStream.hxx" #include "cmStringAlgorithms.h" -#include "cmSystemTools.h" #include "cmVisualStudioSlnData.h" namespace { diff --git a/Source/cmVisualStudioWCEPlatformParser.cxx b/Source/cmVisualStudioWCEPlatformParser.cxx index 3b113aa..2f71cf5 100644 --- a/Source/cmVisualStudioWCEPlatformParser.cxx +++ b/Source/cmVisualStudioWCEPlatformParser.cxx @@ -2,8 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmVisualStudioWCEPlatformParser.h" +#include <algorithm> +#include <cstring> +#include <utility> + #include "cmGlobalVisualStudioGenerator.h" -#include "cmXMLParser.h" +#include "cmSystemTools.h" int cmVisualStudioWCEPlatformParser::ParseVersion(const char* version) { |