diff options
77 files changed, 3 insertions, 152 deletions
diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.h b/Source/CPack/IFW/cmCPackIFWGenerator.h index 88a3741e52..d656063525 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.h +++ b/Source/CPack/IFW/cmCPackIFWGenerator.h @@ -10,7 +10,6 @@ #include "cmCPackIFWInstaller.h" #include "cmCPackIFWPackage.h" #include "cmCPackIFWRepository.h" -#include "cmTypeMacro.h" #include <map> #include <set> diff --git a/Source/CPack/cmCPack7zGenerator.h b/Source/CPack/cmCPack7zGenerator.h index 063b032b9e..a617d9b6ad 100644 --- a/Source/CPack/cmCPack7zGenerator.h +++ b/Source/CPack/cmCPack7zGenerator.h @@ -7,7 +7,6 @@ #include "cmCPackArchiveGenerator.h" #include "cmCPackGenerator.h" -#include "cmTypeMacro.h" /** \class cmCPack7zGenerator * \brief A generator for 7z files diff --git a/Source/CPack/cmCPackArchiveGenerator.h b/Source/CPack/cmCPackArchiveGenerator.h index 701066484a..df02ae8a8e 100644 --- a/Source/CPack/cmCPackArchiveGenerator.h +++ b/Source/CPack/cmCPackArchiveGenerator.h @@ -7,7 +7,6 @@ #include "cmArchiveWrite.h" #include "cmCPackGenerator.h" -#include "cmTypeMacro.h" #include <iosfwd> #include <string> diff --git a/Source/CPack/cmCPackDebGenerator.h b/Source/CPack/cmCPackDebGenerator.h index f46ae5a8cc..7db933e362 100644 --- a/Source/CPack/cmCPackDebGenerator.h +++ b/Source/CPack/cmCPackDebGenerator.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCPackGenerator.h" -#include "cmTypeMacro.h" #include <string> #include <vector> diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h index a7652b1009..f32dd70b21 100644 --- a/Source/CPack/cmCPackGenerator.h +++ b/Source/CPack/cmCPackGenerator.h @@ -6,9 +6,7 @@ #include <cmConfigure.h> #include "cmCPackComponentGroup.h" -#include "cmObject.h" #include "cmSystemTools.h" -#include "cmTypeMacro.h" #include <map> #include <sstream> diff --git a/Source/CPack/cmCPackGeneratorFactory.h b/Source/CPack/cmCPackGeneratorFactory.h index 5381eb2d64..0a98f91dbb 100644 --- a/Source/CPack/cmCPackGeneratorFactory.h +++ b/Source/CPack/cmCPackGeneratorFactory.h @@ -5,9 +5,6 @@ #include <cmConfigure.h> -#include "cmObject.h" -#include "cmTypeMacro.h" - #include <map> #include <string> #include <vector> diff --git a/Source/CPack/cmCPackLog.h b/Source/CPack/cmCPackLog.h index 2ac805d0b6..9ffe5c4c4e 100644 --- a/Source/CPack/cmCPackLog.h +++ b/Source/CPack/cmCPackLog.h @@ -5,9 +5,6 @@ #include <cmConfigure.h> -#include "cmObject.h" -#include "cmTypeMacro.h" - #include <ostream> #include <string.h> #include <string> diff --git a/Source/CPack/cmCPackNSISGenerator.h b/Source/CPack/cmCPackNSISGenerator.h index d61341c01a..b4bf2d4b95 100644 --- a/Source/CPack/cmCPackNSISGenerator.h +++ b/Source/CPack/cmCPackNSISGenerator.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCPackGenerator.h" -#include "cmTypeMacro.h" #include <iosfwd> #include <set> diff --git a/Source/CPack/cmCPackPKGGenerator.h b/Source/CPack/cmCPackPKGGenerator.h index 5569185458..bb3c1a7afb 100644 --- a/Source/CPack/cmCPackPKGGenerator.h +++ b/Source/CPack/cmCPackPKGGenerator.h @@ -3,6 +3,9 @@ #ifndef cmCPackPKGGenerator_h #define cmCPackPKGGenerator_h +#include <cmConfigure.h> +#include <set> + #include "cmCPackGenerator.h" class cmCPackComponent; diff --git a/Source/CPack/cmCPackRPMGenerator.h b/Source/CPack/cmCPackRPMGenerator.h index f8bcbfe1f2..4d48bd8fb0 100644 --- a/Source/CPack/cmCPackRPMGenerator.h +++ b/Source/CPack/cmCPackRPMGenerator.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCPackGenerator.h" -#include "cmTypeMacro.h" #include <string> diff --git a/Source/CPack/cmCPackSTGZGenerator.h b/Source/CPack/cmCPackSTGZGenerator.h index a1bee5f5dd..4b9c1c671f 100644 --- a/Source/CPack/cmCPackSTGZGenerator.h +++ b/Source/CPack/cmCPackSTGZGenerator.h @@ -7,7 +7,6 @@ #include "cmCPackGenerator.h" #include "cmCPackTGZGenerator.h" -#include "cmTypeMacro.h" #include <iosfwd> diff --git a/Source/CPack/cmCPackTGZGenerator.h b/Source/CPack/cmCPackTGZGenerator.h index e93fb44557..ee2e975a49 100644 --- a/Source/CPack/cmCPackTGZGenerator.h +++ b/Source/CPack/cmCPackTGZGenerator.h @@ -7,7 +7,6 @@ #include "cmCPackArchiveGenerator.h" #include "cmCPackGenerator.h" -#include "cmTypeMacro.h" /** \class cmCPackTGZGenerator * \brief A generator for TGZ files diff --git a/Source/CPack/cmCPackTXZGenerator.h b/Source/CPack/cmCPackTXZGenerator.h index b8a759712c..876ca7d82f 100644 --- a/Source/CPack/cmCPackTXZGenerator.h +++ b/Source/CPack/cmCPackTXZGenerator.h @@ -7,7 +7,6 @@ #include "cmCPackArchiveGenerator.h" #include "cmCPackGenerator.h" -#include "cmTypeMacro.h" /** \class cmCPackTXZGenerator * \brief A generator for TXZ files diff --git a/Source/CPack/cmCPackTarBZip2Generator.h b/Source/CPack/cmCPackTarBZip2Generator.h index 2e8ba9b309..42214fdf3d 100644 --- a/Source/CPack/cmCPackTarBZip2Generator.h +++ b/Source/CPack/cmCPackTarBZip2Generator.h @@ -7,7 +7,6 @@ #include "cmCPackArchiveGenerator.h" #include "cmCPackGenerator.h" -#include "cmTypeMacro.h" /** \class cmCPackTarBZip2Generator * \brief A generator for TarBZip2 files diff --git a/Source/CPack/cmCPackTarCompressGenerator.h b/Source/CPack/cmCPackTarCompressGenerator.h index 7d253e1c74..1476642a8d 100644 --- a/Source/CPack/cmCPackTarCompressGenerator.h +++ b/Source/CPack/cmCPackTarCompressGenerator.h @@ -7,7 +7,6 @@ #include "cmCPackArchiveGenerator.h" #include "cmCPackGenerator.h" -#include "cmTypeMacro.h" /** \class cmCPackTarCompressGenerator * \brief A generator for TarCompress files diff --git a/Source/CPack/cmCPackZIPGenerator.h b/Source/CPack/cmCPackZIPGenerator.h index e0334fb9a9..95b648910d 100644 --- a/Source/CPack/cmCPackZIPGenerator.h +++ b/Source/CPack/cmCPackZIPGenerator.h @@ -7,7 +7,6 @@ #include "cmCPackArchiveGenerator.h" #include "cmCPackGenerator.h" -#include "cmTypeMacro.h" /** \class cmCPackZIPGenerator * \brief A generator for ZIP files diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index c305cbf51b..b06bd38e66 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -12,7 +12,6 @@ #include "cmState.h" #include "cmStateTypes.h" #include "cmSystemTools.h" -#include "cmTypeMacro.h" #include "cm_auto_ptr.hxx" #include "cmake.h" diff --git a/Source/CTest/cmCTestBuildAndTestHandler.h b/Source/CTest/cmCTestBuildAndTestHandler.h index 1d424f3277..5885738e49 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.h +++ b/Source/CTest/cmCTestBuildAndTestHandler.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestGenericHandler.h" -#include "cmTypeMacro.h" #include <sstream> #include <stddef.h> diff --git a/Source/CTest/cmCTestBuildCommand.h b/Source/CTest/cmCTestBuildCommand.h index acc0ecf72c..9cc6f7e8f0 100644 --- a/Source/CTest/cmCTestBuildCommand.h +++ b/Source/CTest/cmCTestBuildCommand.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestHandlerCommand.h" -#include "cmTypeMacro.h" #include <string> #include <vector> diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h index 69970d5eb8..5bd1157bfa 100644 --- a/Source/CTest/cmCTestBuildHandler.h +++ b/Source/CTest/cmCTestBuildHandler.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestGenericHandler.h" -#include "cmTypeMacro.h" #include <cmsys/RegularExpression.hxx> #include <deque> diff --git a/Source/CTest/cmCTestConfigureCommand.h b/Source/CTest/cmCTestConfigureCommand.h index 95a476f536..22d12179c1 100644 --- a/Source/CTest/cmCTestConfigureCommand.h +++ b/Source/CTest/cmCTestConfigureCommand.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestHandlerCommand.h" -#include "cmTypeMacro.h" #include <string> diff --git a/Source/CTest/cmCTestConfigureHandler.h b/Source/CTest/cmCTestConfigureHandler.h index 4a7c74b937..7fa95edea3 100644 --- a/Source/CTest/cmCTestConfigureHandler.h +++ b/Source/CTest/cmCTestConfigureHandler.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestGenericHandler.h" -#include "cmTypeMacro.h" /** \class cmCTestConfigureHandler * \brief A class that handles ctest -S invocations diff --git a/Source/CTest/cmCTestCoverageCommand.h b/Source/CTest/cmCTestCoverageCommand.h index 98dd6bfe32..bf42aa1325 100644 --- a/Source/CTest/cmCTestCoverageCommand.h +++ b/Source/CTest/cmCTestCoverageCommand.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestHandlerCommand.h" -#include "cmTypeMacro.h" #include <set> #include <string> diff --git a/Source/CTest/cmCTestCoverageHandler.h b/Source/CTest/cmCTestCoverageHandler.h index 0ba4a7a417..339b5d7094 100644 --- a/Source/CTest/cmCTestCoverageHandler.h +++ b/Source/CTest/cmCTestCoverageHandler.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestGenericHandler.h" -#include "cmTypeMacro.h" #include <cmsys/RegularExpression.hxx> #include <iosfwd> diff --git a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h index a8d00e0c8d..4c1438b8b7 100644 --- a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h +++ b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestCommand.h" -#include "cmTypeMacro.h" #include <string> #include <vector> diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h index ef9fdc02dd..4176eb2ddc 100644 --- a/Source/CTest/cmCTestGenericHandler.h +++ b/Source/CTest/cmCTestGenericHandler.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTest.h" -#include "cmObject.h" #include "cmSystemTools.h" #include <map> diff --git a/Source/CTest/cmCTestHandlerCommand.h b/Source/CTest/cmCTestHandlerCommand.h index 0a1bae4274..92748af24c 100644 --- a/Source/CTest/cmCTestHandlerCommand.h +++ b/Source/CTest/cmCTestHandlerCommand.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestCommand.h" -#include "cmTypeMacro.h" #include <stddef.h> #include <string> diff --git a/Source/CTest/cmCTestMemCheckCommand.h b/Source/CTest/cmCTestMemCheckCommand.h index efd4ecfeeb..30d9e2bc1d 100644 --- a/Source/CTest/cmCTestMemCheckCommand.h +++ b/Source/CTest/cmCTestMemCheckCommand.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestTestCommand.h" -#include "cmTypeMacro.h" #include <string> diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h index 2300f683e0..b12da281ab 100644 --- a/Source/CTest/cmCTestMemCheckHandler.h +++ b/Source/CTest/cmCTestMemCheckHandler.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestTestHandler.h" -#include "cmTypeMacro.h" #include <string> #include <vector> diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.h b/Source/CTest/cmCTestReadCustomFilesCommand.h index 53610ba65f..e15559574a 100644 --- a/Source/CTest/cmCTestReadCustomFilesCommand.h +++ b/Source/CTest/cmCTestReadCustomFilesCommand.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestCommand.h" -#include "cmTypeMacro.h" #include <string> #include <vector> diff --git a/Source/CTest/cmCTestRunScriptCommand.h b/Source/CTest/cmCTestRunScriptCommand.h index ac79db424c..01ed62ebcb 100644 --- a/Source/CTest/cmCTestRunScriptCommand.h +++ b/Source/CTest/cmCTestRunScriptCommand.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestCommand.h" -#include "cmTypeMacro.h" #include <string> #include <vector> diff --git a/Source/CTest/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h index 5ba8ecf257..47644be02b 100644 --- a/Source/CTest/cmCTestScriptHandler.h +++ b/Source/CTest/cmCTestScriptHandler.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestGenericHandler.h" -#include "cmTypeMacro.h" #include <string> #include <vector> diff --git a/Source/CTest/cmCTestSleepCommand.h b/Source/CTest/cmCTestSleepCommand.h index c7e076f4d2..1052f76d55 100644 --- a/Source/CTest/cmCTestSleepCommand.h +++ b/Source/CTest/cmCTestSleepCommand.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestCommand.h" -#include "cmTypeMacro.h" #include <string> #include <vector> diff --git a/Source/CTest/cmCTestStartCommand.h b/Source/CTest/cmCTestStartCommand.h index 1686b20707..cc72d0c6b6 100644 --- a/Source/CTest/cmCTestStartCommand.h +++ b/Source/CTest/cmCTestStartCommand.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestCommand.h" -#include "cmTypeMacro.h" #include <iosfwd> #include <string> diff --git a/Source/CTest/cmCTestSubmitCommand.h b/Source/CTest/cmCTestSubmitCommand.h index f8b9a45e02..f5b52c178b 100644 --- a/Source/CTest/cmCTestSubmitCommand.h +++ b/Source/CTest/cmCTestSubmitCommand.h @@ -7,7 +7,6 @@ #include "cmCTest.h" #include "cmCTestHandlerCommand.h" -#include "cmTypeMacro.h" #include <set> #include <string> diff --git a/Source/CTest/cmCTestSubmitHandler.h b/Source/CTest/cmCTestSubmitHandler.h index 6e57de8564..baaf8af149 100644 --- a/Source/CTest/cmCTestSubmitHandler.h +++ b/Source/CTest/cmCTestSubmitHandler.h @@ -7,7 +7,6 @@ #include "cmCTest.h" #include "cmCTestGenericHandler.h" -#include "cmTypeMacro.h" #include <iosfwd> #include <set> diff --git a/Source/CTest/cmCTestTestCommand.h b/Source/CTest/cmCTestTestCommand.h index b4a01dcd69..3250d9370b 100644 --- a/Source/CTest/cmCTestTestCommand.h +++ b/Source/CTest/cmCTestTestCommand.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestHandlerCommand.h" -#include "cmTypeMacro.h" #include <string> diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h index 703707f77c..5b07e98c41 100644 --- a/Source/CTest/cmCTestTestHandler.h +++ b/Source/CTest/cmCTestTestHandler.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestGenericHandler.h" -#include "cmTypeMacro.h" #include <cmsys/RegularExpression.hxx> #include <iosfwd> diff --git a/Source/CTest/cmCTestUpdateCommand.h b/Source/CTest/cmCTestUpdateCommand.h index e834a29500..5761f50ffa 100644 --- a/Source/CTest/cmCTestUpdateCommand.h +++ b/Source/CTest/cmCTestUpdateCommand.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestHandlerCommand.h" -#include "cmTypeMacro.h" #include <string> diff --git a/Source/CTest/cmCTestUpdateHandler.h b/Source/CTest/cmCTestUpdateHandler.h index 9a3ec1bbe0..87781e8f52 100644 --- a/Source/CTest/cmCTestUpdateHandler.h +++ b/Source/CTest/cmCTestUpdateHandler.h @@ -6,7 +6,6 @@ #include <cmConfigure.h> #include "cmCTestGenericHandler.h" -#include "cmTypeMacro.h" #include <string> #include <utility> diff --git a/Source/CTest/cmCTestUploadCommand.h b/Source/CTest/cmCTestUploadCommand.h index b231844605..474f6991e6 100644 --- a/Source/CTest/cmCTestUploadCommand.h +++ b/Source/CTest/cmCTestUploadCommand.h @@ -7,7 +7,6 @@ #include "cmCTest.h" #include "cmCTestHandlerCommand.h" -#include "cmTypeMacro.h" #include <string> diff --git a/Source/CTest/cmCTestUploadHandler.h b/Source/CTest/cmCTestUploadHandler.h index eb05a86507..77c2aec3b9 100644 --- a/Source/CTest/cmCTestUploadHandler.h +++ b/Source/CTest/cmCTestUploadHandler.h @@ -7,7 +7,6 @@ #include "cmCTest.h" #include "cmCTestGenericHandler.h" -#include "cmTypeMacro.h" /** \class cmCTestUploadHandler * \brief Helper class for CTest diff --git a/Source/cmAddCompileOptionsCommand.h b/Source/cmAddCompileOptionsCommand.h index 3625626413..71009b4236 100644 --- a/Source/cmAddCompileOptionsCommand.h +++ b/Source/cmAddCompileOptionsCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmAuxSourceDirectoryCommand.h b/Source/cmAuxSourceDirectoryCommand.h index 89eba7f7a9..d99bf7bd89 100644 --- a/Source/cmAuxSourceDirectoryCommand.h +++ b/Source/cmAuxSourceDirectoryCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmBuildNameCommand.h b/Source/cmBuildNameCommand.h index aa8669a92f..1e1f4b566f 100644 --- a/Source/cmBuildNameCommand.h +++ b/Source/cmBuildNameCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmCMakeHostSystemInformationCommand.h b/Source/cmCMakeHostSystemInformationCommand.h index 8420d0870d..22f3d54dda 100644 --- a/Source/cmCMakeHostSystemInformationCommand.h +++ b/Source/cmCMakeHostSystemInformationCommand.h @@ -9,7 +9,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; namespace cmsys { diff --git a/Source/cmCommand.h b/Source/cmCommand.h index b263a6192c..dcfe8da137 100644 --- a/Source/cmCommand.h +++ b/Source/cmCommand.h @@ -3,8 +3,6 @@ #ifndef cmCommand_h #define cmCommand_h -#include "cmObject.h" - #include "cmCommandArgumentsHelper.h" #include "cmListFileCache.h" #include "cmMakefile.h" diff --git a/Source/cmElseIfCommand.h b/Source/cmElseIfCommand.h index c66d642c02..3f1ddde8de 100644 --- a/Source/cmElseIfCommand.h +++ b/Source/cmElseIfCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmExportCommand.h b/Source/cmExportCommand.h index 41c3291a6a..99dac7df96 100644 --- a/Source/cmExportCommand.h +++ b/Source/cmExportCommand.h @@ -9,7 +9,6 @@ #include "cmCommand.h" #include "cmCommandArgumentsHelper.h" -#include "cmTypeMacro.h" class cmExecutionStatus; class cmExportSet; diff --git a/Source/cmExportLibraryDependenciesCommand.h b/Source/cmExportLibraryDependenciesCommand.h index 2f6ad65dba..be53349623 100644 --- a/Source/cmExportLibraryDependenciesCommand.h +++ b/Source/cmExportLibraryDependenciesCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmFLTKWrapUICommand.h b/Source/cmFLTKWrapUICommand.h index 5559854426..835f0a7ee8 100644 --- a/Source/cmFLTKWrapUICommand.h +++ b/Source/cmFLTKWrapUICommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; class cmSourceFile; diff --git a/Source/cmIncludeExternalMSProjectCommand.h b/Source/cmIncludeExternalMSProjectCommand.h index 2f9558967d..9fcf467c54 100644 --- a/Source/cmIncludeExternalMSProjectCommand.h +++ b/Source/cmIncludeExternalMSProjectCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmInstallProgramsCommand.h b/Source/cmInstallProgramsCommand.h index 235ff1ae2d..ca07a2f39e 100644 --- a/Source/cmInstallProgramsCommand.h +++ b/Source/cmInstallProgramsCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmLinkLibrariesCommand.h b/Source/cmLinkLibrariesCommand.h index 71053f5e65..66d7ec4f4f 100644 --- a/Source/cmLinkLibrariesCommand.h +++ b/Source/cmLinkLibrariesCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmLoadCacheCommand.h b/Source/cmLoadCacheCommand.h index 432ba369fc..539c74e62a 100644 --- a/Source/cmLoadCacheCommand.h +++ b/Source/cmLoadCacheCommand.h @@ -9,7 +9,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmLoadCommandCommand.h b/Source/cmLoadCommandCommand.h index 6c893fc148..d16dfeaa23 100644 --- a/Source/cmLoadCommandCommand.h +++ b/Source/cmLoadCommandCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmObject.h b/Source/cmObject.h deleted file mode 100644 index 621a06f561..0000000000 --- a/Source/cmObject.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#ifndef cmObject_h -#define cmObject_h - -#include <cmConfigure.h> - -#include "cmStandardIncludes.h" - -/** \class cmObject - * \brief Superclass for all commands and other classes in CMake. - * - * cmObject is the base class for all classes in CMake. It defines some - * methods such as GetNameOfClass, IsA, SafeDownCast. - */ -class cmObject -{ -public: - /** - * Need virtual destructor to destroy real command type. - */ - virtual ~cmObject() {} - - /** - * The class name of the command. - */ - virtual const char* GetNameOfClass() = 0; - - /** - * Returns true if this class is the given class, or a subclass of it. - */ - static bool IsTypeOf(const char* type) { return !strcmp("cmObject", type); } - - /** - * Returns true if this object is an instance of the given class or - * a subclass of it. - */ - virtual bool IsA(const char* type) { return cmObject::IsTypeOf(type); } -}; - -#endif diff --git a/Source/cmOutputRequiredFilesCommand.h b/Source/cmOutputRequiredFilesCommand.h index cb485684d1..c4ce680252 100644 --- a/Source/cmOutputRequiredFilesCommand.h +++ b/Source/cmOutputRequiredFilesCommand.h @@ -10,7 +10,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmDependInformation; class cmExecutionStatus; diff --git a/Source/cmQTWrapCPPCommand.h b/Source/cmQTWrapCPPCommand.h index d07eba0c7c..8eb5ff93eb 100644 --- a/Source/cmQTWrapCPPCommand.h +++ b/Source/cmQTWrapCPPCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmQTWrapUICommand.h b/Source/cmQTWrapUICommand.h index 9b8c5a0f79..876ddd529f 100644 --- a/Source/cmQTWrapUICommand.h +++ b/Source/cmQTWrapUICommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmRemoveCommand.h b/Source/cmRemoveCommand.h index 8d82d6f741..c935f28708 100644 --- a/Source/cmRemoveCommand.h +++ b/Source/cmRemoveCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmRemoveDefinitionsCommand.h b/Source/cmRemoveDefinitionsCommand.h index 6aed8fc3ec..2bcc12dd73 100644 --- a/Source/cmRemoveDefinitionsCommand.h +++ b/Source/cmRemoveDefinitionsCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmSourceGroupCommand.h b/Source/cmSourceGroupCommand.h index 86bd61e82b..f533be15ca 100644 --- a/Source/cmSourceGroupCommand.h +++ b/Source/cmSourceGroupCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index 0aab6d9b36..a2047af9c2 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -49,6 +49,5 @@ extern void operator<<(std::ostream&, const std::ostringstream&); #include "cmCustomCommandLines.h" #include "cmDocumentationEntry.h" #include "cmTargetLinkLibraryType.h" -#include "cmTypeMacro.h" #endif diff --git a/Source/cmState.cxx b/Source/cmState.cxx index 468b191e4c..db1e542866 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -10,7 +10,6 @@ #include "cmDefinitions.h" #include "cmListFileCache.h" #include "cmSystemTools.h" -#include "cmTypeMacro.h" #include "cmake.h" #include <algorithm> diff --git a/Source/cmSubdirDependsCommand.h b/Source/cmSubdirDependsCommand.h index aa3d2b36f7..80ff24f386 100644 --- a/Source/cmSubdirDependsCommand.h +++ b/Source/cmSubdirDependsCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmTargetCompileDefinitionsCommand.h b/Source/cmTargetCompileDefinitionsCommand.h index 766a9c37ed..caaf23b2a4 100644 --- a/Source/cmTargetCompileDefinitionsCommand.h +++ b/Source/cmTargetCompileDefinitionsCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmTargetPropCommandBase.h" -#include "cmTypeMacro.h" class cmCommand; class cmExecutionStatus; diff --git a/Source/cmTargetCompileFeaturesCommand.h b/Source/cmTargetCompileFeaturesCommand.h index c599a37e29..01f2938fce 100644 --- a/Source/cmTargetCompileFeaturesCommand.h +++ b/Source/cmTargetCompileFeaturesCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmTargetPropCommandBase.h" -#include "cmTypeMacro.h" class cmCommand; class cmExecutionStatus; diff --git a/Source/cmTargetCompileOptionsCommand.h b/Source/cmTargetCompileOptionsCommand.h index 7b41352f86..179013b92c 100644 --- a/Source/cmTargetCompileOptionsCommand.h +++ b/Source/cmTargetCompileOptionsCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmTargetPropCommandBase.h" -#include "cmTypeMacro.h" class cmCommand; class cmExecutionStatus; diff --git a/Source/cmTargetIncludeDirectoriesCommand.h b/Source/cmTargetIncludeDirectoriesCommand.h index 81c0b11c14..bc6cf0deae 100644 --- a/Source/cmTargetIncludeDirectoriesCommand.h +++ b/Source/cmTargetIncludeDirectoriesCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmTargetPropCommandBase.h" -#include "cmTypeMacro.h" class cmCommand; class cmExecutionStatus; diff --git a/Source/cmTargetSourcesCommand.h b/Source/cmTargetSourcesCommand.h index 6f4b49fe93..b1afac21ce 100644 --- a/Source/cmTargetSourcesCommand.h +++ b/Source/cmTargetSourcesCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmTargetPropCommandBase.h" -#include "cmTypeMacro.h" class cmCommand; class cmExecutionStatus; diff --git a/Source/cmTypeMacro.h b/Source/cmTypeMacro.h deleted file mode 100644 index b302ff1a89..0000000000 --- a/Source/cmTypeMacro.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#ifndef cmTypeMacro_h -#define cmTypeMacro_h - -// All subclasses of cmCommand or cmCTestGenericHandler should -// invoke this macro. -#define cmTypeMacro(thisClass, superclass) \ - const char* GetNameOfClass() CM_OVERRIDE { return #thisClass; } \ - typedef superclass Superclass; \ - static bool IsTypeOf(const char* type) \ - { \ - if (!strcmp(#thisClass, type)) { \ - return true; \ - } \ - return Superclass::IsTypeOf(type); \ - } \ - bool IsA(const char* type) CM_OVERRIDE \ - { \ - return thisClass::IsTypeOf(type); \ - } \ - static thisClass* SafeDownCast(cmObject* c) \ - { \ - if (c && c->IsA(#thisClass)) { \ - return static_cast<thisClass*>(c); \ - } \ - return 0; \ - } \ - class cmTypeMacro_UseTrailingSemicolon - -#endif diff --git a/Source/cmUseMangledMesaCommand.h b/Source/cmUseMangledMesaCommand.h index 68e77a1b4c..9a49f94a47 100644 --- a/Source/cmUseMangledMesaCommand.h +++ b/Source/cmUseMangledMesaCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmUtilitySourceCommand.h b/Source/cmUtilitySourceCommand.h index a8549d1a2b..849b96695b 100644 --- a/Source/cmUtilitySourceCommand.h +++ b/Source/cmUtilitySourceCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmVariableRequiresCommand.h b/Source/cmVariableRequiresCommand.h index 0b6be3b4d3..baf717c666 100644 --- a/Source/cmVariableRequiresCommand.h +++ b/Source/cmVariableRequiresCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmVariableWatchCommand.h b/Source/cmVariableWatchCommand.h index 2541ca81f6..919bac4ec0 100644 --- a/Source/cmVariableWatchCommand.h +++ b/Source/cmVariableWatchCommand.h @@ -9,7 +9,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; diff --git a/Source/cmWriteFileCommand.h b/Source/cmWriteFileCommand.h index df7ccc3f47..73e6e2256a 100644 --- a/Source/cmWriteFileCommand.h +++ b/Source/cmWriteFileCommand.h @@ -8,7 +8,6 @@ #include <vector> #include "cmCommand.h" -#include "cmTypeMacro.h" class cmExecutionStatus; |