diff options
129 files changed, 13 insertions, 266 deletions
diff --git a/Source/CTest/cmCTestBuildCommand.h b/Source/CTest/cmCTestBuildCommand.h index 0aaf623cbe..acc0ecf72c 100644 --- a/Source/CTest/cmCTestBuildCommand.h +++ b/Source/CTest/cmCTestBuildCommand.h @@ -47,8 +47,6 @@ public: bool InitialPass(std::vector<std::string> const& args, cmExecutionStatus& status) CM_OVERRIDE; - cmTypeMacro(cmCTestBuildCommand, cmCTestHandlerCommand); - cmGlobalGenerator* GlobalGenerator; protected: diff --git a/Source/CTest/cmCTestCommand.h b/Source/CTest/cmCTestCommand.h index 2b9b93b81a..6fc237aac7 100644 --- a/Source/CTest/cmCTestCommand.h +++ b/Source/CTest/cmCTestCommand.h @@ -26,8 +26,6 @@ public: cmCTest* CTest; cmCTestScriptHandler* CTestScriptHandler; - - cmTypeMacro(cmCTestCommand, cmCommand); }; #endif diff --git a/Source/CTest/cmCTestConfigureCommand.h b/Source/CTest/cmCTestConfigureCommand.h index 8bc69fe6cf..95a476f536 100644 --- a/Source/CTest/cmCTestConfigureCommand.h +++ b/Source/CTest/cmCTestConfigureCommand.h @@ -39,8 +39,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "ctest_configure"; } - cmTypeMacro(cmCTestConfigureCommand, cmCTestHandlerCommand); - protected: cmCTestGenericHandler* InitializeHandler() CM_OVERRIDE; diff --git a/Source/CTest/cmCTestCoverageCommand.h b/Source/CTest/cmCTestCoverageCommand.h index d54e68d864..98dd6bfe32 100644 --- a/Source/CTest/cmCTestCoverageCommand.h +++ b/Source/CTest/cmCTestCoverageCommand.h @@ -40,7 +40,7 @@ public: */ std::string GetName() const CM_OVERRIDE { return "ctest_coverage"; } - cmTypeMacro(cmCTestCoverageCommand, cmCTestHandlerCommand); + typedef cmCTestHandlerCommand Superclass; protected: cmCTestGenericHandler* InitializeHandler() CM_OVERRIDE; diff --git a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h index 8b5d5a4407..a8d00e0c8d 100644 --- a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h +++ b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h @@ -51,8 +51,6 @@ public: { return "ctest_empty_binary_directory"; } - - cmTypeMacro(cmCTestEmptyBinaryDirectoryCommand, cmCTestCommand); }; #endif diff --git a/Source/CTest/cmCTestHandlerCommand.h b/Source/CTest/cmCTestHandlerCommand.h index 3fd384f6ea..0a1bae4274 100644 --- a/Source/CTest/cmCTestHandlerCommand.h +++ b/Source/CTest/cmCTestHandlerCommand.h @@ -32,8 +32,6 @@ public: bool InitialPass(std::vector<std::string> const& args, cmExecutionStatus& status) CM_OVERRIDE; - cmTypeMacro(cmCTestHandlerCommand, cmCTestCommand); - enum { ct_NONE, diff --git a/Source/CTest/cmCTestMemCheckCommand.h b/Source/CTest/cmCTestMemCheckCommand.h index d3b8be7153..efd4ecfeeb 100644 --- a/Source/CTest/cmCTestMemCheckCommand.h +++ b/Source/CTest/cmCTestMemCheckCommand.h @@ -39,8 +39,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "ctest_memcheck"; } - cmTypeMacro(cmCTestMemCheckCommand, cmCTestTestCommand); - protected: cmCTestGenericHandler* InitializeActualHandler() CM_OVERRIDE; }; diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.h b/Source/CTest/cmCTestReadCustomFilesCommand.h index 29eba90d4f..53610ba65f 100644 --- a/Source/CTest/cmCTestReadCustomFilesCommand.h +++ b/Source/CTest/cmCTestReadCustomFilesCommand.h @@ -46,8 +46,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "ctest_read_custom_files"; } - - cmTypeMacro(cmCTestReadCustomFilesCommand, cmCTestCommand); }; #endif diff --git a/Source/CTest/cmCTestRunScriptCommand.h b/Source/CTest/cmCTestRunScriptCommand.h index 2978bb91bd..ac79db424c 100644 --- a/Source/CTest/cmCTestRunScriptCommand.h +++ b/Source/CTest/cmCTestRunScriptCommand.h @@ -47,8 +47,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "ctest_run_script"; } - - cmTypeMacro(cmCTestRunScriptCommand, cmCTestCommand); }; #endif diff --git a/Source/CTest/cmCTestSleepCommand.h b/Source/CTest/cmCTestSleepCommand.h index b144012855..c7e076f4d2 100644 --- a/Source/CTest/cmCTestSleepCommand.h +++ b/Source/CTest/cmCTestSleepCommand.h @@ -47,8 +47,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "ctest_sleep"; } - - cmTypeMacro(cmCTestSleepCommand, cmCTestCommand); }; #endif diff --git a/Source/CTest/cmCTestStartCommand.h b/Source/CTest/cmCTestStartCommand.h index 6bb0bc6b08..1686b20707 100644 --- a/Source/CTest/cmCTestStartCommand.h +++ b/Source/CTest/cmCTestStartCommand.h @@ -60,8 +60,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "ctest_start"; } - cmTypeMacro(cmCTestStartCommand, cmCTestCommand); - private: bool InitialCheckout(std::ostream& ofs, std::string const& sourceDir); bool CreateNewTag; diff --git a/Source/CTest/cmCTestSubmitCommand.h b/Source/CTest/cmCTestSubmitCommand.h index db8a604b9d..f8b9a45e02 100644 --- a/Source/CTest/cmCTestSubmitCommand.h +++ b/Source/CTest/cmCTestSubmitCommand.h @@ -55,7 +55,7 @@ public: */ std::string GetName() const CM_OVERRIDE { return "ctest_submit"; } - cmTypeMacro(cmCTestSubmitCommand, cmCTestHandlerCommand); + typedef cmCTestHandlerCommand Superclass; protected: cmCTestGenericHandler* InitializeHandler() CM_OVERRIDE; diff --git a/Source/CTest/cmCTestTestCommand.h b/Source/CTest/cmCTestTestCommand.h index 6161acbd61..b4a01dcd69 100644 --- a/Source/CTest/cmCTestTestCommand.h +++ b/Source/CTest/cmCTestTestCommand.h @@ -39,8 +39,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "ctest_test"; } - cmTypeMacro(cmCTestTestCommand, cmCTestHandlerCommand); - protected: virtual cmCTestGenericHandler* InitializeActualHandler(); cmCTestGenericHandler* InitializeHandler() CM_OVERRIDE; diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 4e6f1e99f5..132d0499f8 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -59,8 +59,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "subdirs"; } - cmTypeMacro(cmCTestSubdirCommand, cmCommand); - cmCTestTestHandler* TestHandler; }; @@ -140,8 +138,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "add_subdirectory"; } - cmTypeMacro(cmCTestAddSubdirectoryCommand, cmCommand); - cmCTestTestHandler* TestHandler; }; @@ -214,8 +210,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "add_test"; } - cmTypeMacro(cmCTestAddTestCommand, cmCommand); - cmCTestTestHandler* TestHandler; }; @@ -254,8 +248,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "set_tests_properties"; } - cmTypeMacro(cmCTestSetTestsPropertiesCommand, cmCommand); - cmCTestTestHandler* TestHandler; }; diff --git a/Source/CTest/cmCTestUpdateCommand.h b/Source/CTest/cmCTestUpdateCommand.h index 9d1a86e0e6..e834a29500 100644 --- a/Source/CTest/cmCTestUpdateCommand.h +++ b/Source/CTest/cmCTestUpdateCommand.h @@ -39,8 +39,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "ctest_update"; } - cmTypeMacro(cmCTestUpdateCommand, cmCTestHandlerCommand); - protected: cmCTestGenericHandler* InitializeHandler() CM_OVERRIDE; }; diff --git a/Source/CTest/cmCTestUploadCommand.h b/Source/CTest/cmCTestUploadCommand.h index b85807798d..b231844605 100644 --- a/Source/CTest/cmCTestUploadCommand.h +++ b/Source/CTest/cmCTestUploadCommand.h @@ -41,7 +41,7 @@ public: */ std::string GetName() const CM_OVERRIDE { return "ctest_upload"; } - cmTypeMacro(cmCTestUploadCommand, cmCTestHandlerCommand); + typedef cmCTestHandlerCommand Superclass; protected: cmCTestGenericHandler* InitializeHandler() CM_OVERRIDE; diff --git a/Source/cmAddCompileOptionsCommand.h b/Source/cmAddCompileOptionsCommand.h index 52c4b51d27..9f2cf66ab2 100644 --- a/Source/cmAddCompileOptionsCommand.h +++ b/Source/cmAddCompileOptionsCommand.h @@ -24,8 +24,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "add_compile_options"; } - - cmTypeMacro(cmAddCompileOptionsCommand, cmCommand); }; #endif diff --git a/Source/cmAddCustomCommandCommand.h b/Source/cmAddCustomCommandCommand.h index 527bb6c957..643163c7af 100644 --- a/Source/cmAddCustomCommandCommand.h +++ b/Source/cmAddCustomCommandCommand.h @@ -31,8 +31,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "add_custom_command"; } - cmTypeMacro(cmAddCustomCommandCommand, cmCommand); - protected: bool CheckOutputs(const std::vector<std::string>& outputs); }; diff --git a/Source/cmAddCustomTargetCommand.h b/Source/cmAddCustomTargetCommand.h index a4475c7f13..2ad244c574 100644 --- a/Source/cmAddCustomTargetCommand.h +++ b/Source/cmAddCustomTargetCommand.h @@ -31,8 +31,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "add_custom_target"; } - - cmTypeMacro(cmAddCustomTargetCommand, cmCommand); }; #endif diff --git a/Source/cmAddDefinitionsCommand.h b/Source/cmAddDefinitionsCommand.h index 43d0199453..c6b56992e0 100644 --- a/Source/cmAddDefinitionsCommand.h +++ b/Source/cmAddDefinitionsCommand.h @@ -30,8 +30,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "add_definitions"; } - - cmTypeMacro(cmAddDefinitionsCommand, cmCommand); }; #endif diff --git a/Source/cmAddDependenciesCommand.h b/Source/cmAddDependenciesCommand.h index 95e2ac64b5..2c7aa02cd2 100644 --- a/Source/cmAddDependenciesCommand.h +++ b/Source/cmAddDependenciesCommand.h @@ -29,8 +29,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "add_dependencies"; } - - cmTypeMacro(cmAddDependenciesCommand, cmCommand); }; #endif diff --git a/Source/cmAddExecutableCommand.h b/Source/cmAddExecutableCommand.h index fc08e8b763..03faaf10b4 100644 --- a/Source/cmAddExecutableCommand.h +++ b/Source/cmAddExecutableCommand.h @@ -30,8 +30,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "add_executable"; } - - cmTypeMacro(cmAddExecutableCommand, cmCommand); }; #endif diff --git a/Source/cmAddLibraryCommand.h b/Source/cmAddLibraryCommand.h index d072b8075f..d8eba8dc91 100644 --- a/Source/cmAddLibraryCommand.h +++ b/Source/cmAddLibraryCommand.h @@ -30,8 +30,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "add_library"; } - - cmTypeMacro(cmAddLibraryCommand, cmCommand); }; #endif diff --git a/Source/cmAddSubDirectoryCommand.h b/Source/cmAddSubDirectoryCommand.h index 7347482153..f300b2e1c6 100644 --- a/Source/cmAddSubDirectoryCommand.h +++ b/Source/cmAddSubDirectoryCommand.h @@ -31,8 +31,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "add_subdirectory"; } - - cmTypeMacro(cmAddSubDirectoryCommand, cmCommand); }; #endif diff --git a/Source/cmAddTestCommand.h b/Source/cmAddTestCommand.h index 92db7bc8d0..7bbf7cf1c7 100644 --- a/Source/cmAddTestCommand.h +++ b/Source/cmAddTestCommand.h @@ -30,8 +30,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "add_test"; } - cmTypeMacro(cmAddTestCommand, cmCommand); - private: bool HandleNameMode(std::vector<std::string> const& args); }; diff --git a/Source/cmAuxSourceDirectoryCommand.h b/Source/cmAuxSourceDirectoryCommand.h index cca70dc0d3..9840d8e830 100644 --- a/Source/cmAuxSourceDirectoryCommand.h +++ b/Source/cmAuxSourceDirectoryCommand.h @@ -33,8 +33,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "aux_source_directory"; } - - cmTypeMacro(cmAuxSourceDirectoryCommand, cmCommand); }; #endif diff --git a/Source/cmBreakCommand.h b/Source/cmBreakCommand.h index ab58ab2f55..f1ade9a1ea 100644 --- a/Source/cmBreakCommand.h +++ b/Source/cmBreakCommand.h @@ -34,8 +34,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "break"; } - - cmTypeMacro(cmBreakCommand, cmCommand); }; #endif diff --git a/Source/cmBuildCommand.h b/Source/cmBuildCommand.h index a53a099c1c..0dce4e4aaf 100644 --- a/Source/cmBuildCommand.h +++ b/Source/cmBuildCommand.h @@ -40,8 +40,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "build_command"; } - cmTypeMacro(cmBuildCommand, cmCommand); - private: bool IgnoreErrors() const; }; diff --git a/Source/cmBuildNameCommand.h b/Source/cmBuildNameCommand.h index 7c09d734aa..6e8d98b05a 100644 --- a/Source/cmBuildNameCommand.h +++ b/Source/cmBuildNameCommand.h @@ -8,7 +8,6 @@ class cmBuildNameCommand : public cmCommand { public: - cmTypeMacro(cmBuildNameCommand, cmCommand); cmCommand* Clone() CM_OVERRIDE { return new cmBuildNameCommand; } bool InitialPass(std::vector<std::string> const& args, cmExecutionStatus& status) CM_OVERRIDE; diff --git a/Source/cmCMakeHostSystemInformationCommand.h b/Source/cmCMakeHostSystemInformationCommand.h index 4ab6aa1c1e..bddd7e1948 100644 --- a/Source/cmCMakeHostSystemInformationCommand.h +++ b/Source/cmCMakeHostSystemInformationCommand.h @@ -44,8 +44,6 @@ public: return "cmake_host_system_information"; } - cmTypeMacro(cmCMakeHostSystemInformationCommand, cmCommand); - private: bool GetValue(cmsys::SystemInformation& info, std::string const& key, std::string& value); diff --git a/Source/cmCMakeMinimumRequired.h b/Source/cmCMakeMinimumRequired.h index 425aeedfe6..3acedd2c6a 100644 --- a/Source/cmCMakeMinimumRequired.h +++ b/Source/cmCMakeMinimumRequired.h @@ -35,8 +35,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "cmake_minimum_required"; } - cmTypeMacro(cmCMakeMinimumRequired, cmCommand); - private: std::vector<std::string> UnknownArguments; bool EnforceUnknownArguments(); diff --git a/Source/cmCMakePolicyCommand.h b/Source/cmCMakePolicyCommand.h index d5c5cb5551..68d9f7ba0c 100644 --- a/Source/cmCMakePolicyCommand.h +++ b/Source/cmCMakePolicyCommand.h @@ -36,8 +36,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "cmake_policy"; } - cmTypeMacro(cmCMakePolicyCommand, cmCommand); - private: bool HandleSetMode(std::vector<std::string> const& args); bool HandleGetMode(std::vector<std::string> const& args); diff --git a/Source/cmCommand.h b/Source/cmCommand.h index d8e337dd69..dcbd0dc6ba 100644 --- a/Source/cmCommand.h +++ b/Source/cmCommand.h @@ -19,11 +19,9 @@ * to support such features as enable/disable, inheritance, * documentation, and construction. */ -class cmCommand : public cmObject +class cmCommand { public: - cmTypeMacro(cmCommand, cmObject); - /** * Construct the command. By default it is enabled with no makefile. */ @@ -36,7 +34,7 @@ public: /** * Need virtual destructor to destroy real command type. */ - ~cmCommand() CM_OVERRIDE {} + virtual ~cmCommand() {} /** * Specify the makefile. @@ -92,12 +90,10 @@ public: virtual bool IsScriptable() const { return false; } /** - * This is used to avoid including this command - * in documentation. This is mainly used by - * cmMacroHelperCommand and cmFunctionHelperCommand - * which cannot provide appropriate documentation. + * This determines if the command is defined in a cmake script. + * It is the case for cmMacroHelperCommand and cmFunctionHelperCommand. */ - virtual bool ShouldAppearInDocumentation() const { return true; } + virtual bool IsUserDefined() const { return false; } /** * The name of the command as specified in CMakeList.txt. diff --git a/Source/cmConfigureFileCommand.h b/Source/cmConfigureFileCommand.h index f9a0f2a7ba..9df4550f02 100644 --- a/Source/cmConfigureFileCommand.h +++ b/Source/cmConfigureFileCommand.h @@ -8,8 +8,6 @@ class cmConfigureFileCommand : public cmCommand { public: - cmTypeMacro(cmConfigureFileCommand, cmCommand); - cmCommand* Clone() CM_OVERRIDE { return new cmConfigureFileCommand; } /** diff --git a/Source/cmContinueCommand.h b/Source/cmContinueCommand.h index a36d5f36ef..0c4e650e62 100644 --- a/Source/cmContinueCommand.h +++ b/Source/cmContinueCommand.h @@ -34,8 +34,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "continue"; } - - cmTypeMacro(cmContinueCommand, cmCommand); }; #endif diff --git a/Source/cmCoreTryCompile.h b/Source/cmCoreTryCompile.h index 43b971f6e8..5f909dd272 100644 --- a/Source/cmCoreTryCompile.h +++ b/Source/cmCoreTryCompile.h @@ -37,8 +37,6 @@ protected: void FindOutputFile(const std::string& targetName, cmStateEnums::TargetType targetType); - cmTypeMacro(cmCoreTryCompile, cmCommand); - std::string BinaryDirectory; std::string OutputFile; std::string FindErrorMessage; diff --git a/Source/cmCreateTestSourceList.h b/Source/cmCreateTestSourceList.h index ffd06f0193..2f71a00643 100644 --- a/Source/cmCreateTestSourceList.h +++ b/Source/cmCreateTestSourceList.h @@ -29,8 +29,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "create_test_sourcelist"; } - - cmTypeMacro(cmCreateTestSourceList, cmCommand); }; #endif diff --git a/Source/cmDefinePropertyCommand.h b/Source/cmDefinePropertyCommand.h index f49412397a..cdfff9f521 100644 --- a/Source/cmDefinePropertyCommand.h +++ b/Source/cmDefinePropertyCommand.h @@ -22,8 +22,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "define_property"; } - cmTypeMacro(cmDefinePropertyCommand, cmCommand); - private: std::string PropertyName; std::string BriefDocs; diff --git a/Source/cmElseCommand.h b/Source/cmElseCommand.h index 33f73ee14c..32e04a7c4c 100644 --- a/Source/cmElseCommand.h +++ b/Source/cmElseCommand.h @@ -34,8 +34,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "else"; } - - cmTypeMacro(cmElseCommand, cmCommand); }; #endif diff --git a/Source/cmElseIfCommand.h b/Source/cmElseIfCommand.h index a489e30b9c..79484c9a20 100644 --- a/Source/cmElseIfCommand.h +++ b/Source/cmElseIfCommand.h @@ -34,8 +34,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "elseif"; } - - cmTypeMacro(cmElseIfCommand, cmCommand); }; #endif diff --git a/Source/cmEnableLanguageCommand.h b/Source/cmEnableLanguageCommand.h index 98b3841097..34e1d3d66b 100644 --- a/Source/cmEnableLanguageCommand.h +++ b/Source/cmEnableLanguageCommand.h @@ -32,8 +32,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "enable_language"; } - - cmTypeMacro(cmEnableLanguageCommand, cmCommand); }; #endif diff --git a/Source/cmEnableTestingCommand.h b/Source/cmEnableTestingCommand.h index 750ae8cdbd..b94967adbf 100644 --- a/Source/cmEnableTestingCommand.h +++ b/Source/cmEnableTestingCommand.h @@ -37,8 +37,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "enable_testing"; } - - cmTypeMacro(cmEnableTestingCommand, cmCommand); }; #endif diff --git a/Source/cmEndForEachCommand.h b/Source/cmEndForEachCommand.h index 3bcc7cf304..a146e4d46d 100644 --- a/Source/cmEndForEachCommand.h +++ b/Source/cmEndForEachCommand.h @@ -44,8 +44,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "endforeach"; } - - cmTypeMacro(cmEndForEachCommand, cmCommand); }; #endif diff --git a/Source/cmEndFunctionCommand.h b/Source/cmEndFunctionCommand.h index 8b4d2f9d46..ab174fd886 100644 --- a/Source/cmEndFunctionCommand.h +++ b/Source/cmEndFunctionCommand.h @@ -44,8 +44,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "endfunction"; } - - cmTypeMacro(cmEndFunctionCommand, cmCommand); }; #endif diff --git a/Source/cmEndIfCommand.h b/Source/cmEndIfCommand.h index b476c72686..d068bb409f 100644 --- a/Source/cmEndIfCommand.h +++ b/Source/cmEndIfCommand.h @@ -34,8 +34,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "endif"; } - - cmTypeMacro(cmEndIfCommand, cmCommand); }; #endif diff --git a/Source/cmEndMacroCommand.h b/Source/cmEndMacroCommand.h index 806750dbf3..34ae880b36 100644 --- a/Source/cmEndMacroCommand.h +++ b/Source/cmEndMacroCommand.h @@ -44,8 +44,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "endmacro"; } - - cmTypeMacro(cmEndMacroCommand, cmCommand); }; #endif diff --git a/Source/cmEndWhileCommand.h b/Source/cmEndWhileCommand.h index 861d2f07dc..23667060f8 100644 --- a/Source/cmEndWhileCommand.h +++ b/Source/cmEndWhileCommand.h @@ -44,8 +44,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "endwhile"; } - - cmTypeMacro(cmEndWhileCommand, cmCommand); }; #endif diff --git a/Source/cmExecProgramCommand.h b/Source/cmExecProgramCommand.h index 1cc46d3cce..a3e96ae89f 100644 --- a/Source/cmExecProgramCommand.h +++ b/Source/cmExecProgramCommand.h @@ -37,8 +37,6 @@ public: */ bool IsScriptable() const CM_OVERRIDE { return true; } - cmTypeMacro(cmExecProgramCommand, cmCommand); - private: static bool RunCommand(const char* command, std::string& output, int& retVal, const char* directory = CM_NULLPTR, diff --git a/Source/cmExecuteProcessCommand.h b/Source/cmExecuteProcessCommand.h index f7e376afa1..22429986b5 100644 --- a/Source/cmExecuteProcessCommand.h +++ b/Source/cmExecuteProcessCommand.h @@ -35,8 +35,6 @@ public: * This determines if the command is invoked when in script mode. */ bool IsScriptable() const CM_OVERRIDE { return true; } - - cmTypeMacro(cmExecuteProcessCommand, cmCommand); }; #endif diff --git a/Source/cmExportCommand.h b/Source/cmExportCommand.h index ebde71c010..52996d09c3 100644 --- a/Source/cmExportCommand.h +++ b/Source/cmExportCommand.h @@ -35,8 +35,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "export"; } - cmTypeMacro(cmExportCommand, cmCommand); - private: cmCommandArgumentGroup ArgumentGroup; cmCAStringVector Targets; diff --git a/Source/cmExportLibraryDependenciesCommand.h b/Source/cmExportLibraryDependenciesCommand.h index fa9f35333d..1d8f330637 100644 --- a/Source/cmExportLibraryDependenciesCommand.h +++ b/Source/cmExportLibraryDependenciesCommand.h @@ -8,7 +8,6 @@ class cmExportLibraryDependenciesCommand : public cmCommand { public: - cmTypeMacro(cmExportLibraryDependenciesCommand, cmCommand); cmCommand* Clone() CM_OVERRIDE { return new cmExportLibraryDependenciesCommand; diff --git a/Source/cmFLTKWrapUICommand.h b/Source/cmFLTKWrapUICommand.h index 202067f9ce..88073285a9 100644 --- a/Source/cmFLTKWrapUICommand.h +++ b/Source/cmFLTKWrapUICommand.h @@ -14,8 +14,6 @@ class cmFLTKWrapUICommand : public cmCommand { public: - cmTypeMacro(cmFLTKWrapUICommand, cmCommand); - /** * This is a virtual constructor for the command. */ diff --git a/Source/cmFileCommand.h b/Source/cmFileCommand.h index 1d21a19208..b53bae8326 100644 --- a/Source/cmFileCommand.h +++ b/Source/cmFileCommand.h @@ -36,8 +36,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "file"; } - cmTypeMacro(cmFileCommand, cmCommand); - protected: bool HandleRename(std::vector<std::string> const& args); bool HandleRemove(std::vector<std::string> const& args, bool recurse); diff --git a/Source/cmFindBase.h b/Source/cmFindBase.h index 8561f5df12..2b8d4a2ad2 100644 --- a/Source/cmFindBase.h +++ b/Source/cmFindBase.h @@ -20,7 +20,6 @@ public: * the CMakeLists.txt file. */ virtual bool ParseArguments(std::vector<std::string> const& args); - cmTypeMacro(cmFindBase, cmFindCommon); protected: void PrintFindStuff(); diff --git a/Source/cmFindCommon.h b/Source/cmFindCommon.h index 3211bc2499..1809c0a83f 100644 --- a/Source/cmFindCommon.h +++ b/Source/cmFindCommon.h @@ -19,7 +19,6 @@ class cmFindCommon : public cmCommand public: cmFindCommon(); ~cmFindCommon() CM_OVERRIDE; - cmTypeMacro(cmFindCommon, cmCommand); protected: friend class cmSearchPath; diff --git a/Source/cmFindFileCommand.h b/Source/cmFindFileCommand.h index feb6ad2d51..e121784a5f 100644 --- a/Source/cmFindFileCommand.h +++ b/Source/cmFindFileCommand.h @@ -22,8 +22,6 @@ public: */ cmCommand* Clone() CM_OVERRIDE { return new cmFindFileCommand; } std::string GetName() const CM_OVERRIDE { return "find_file"; } - - cmTypeMacro(cmFindFileCommand, cmFindPathCommand); }; #endif diff --git a/Source/cmFindLibraryCommand.h b/Source/cmFindLibraryCommand.h index 39393f6a05..8531e514fb 100644 --- a/Source/cmFindLibraryCommand.h +++ b/Source/cmFindLibraryCommand.h @@ -38,8 +38,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "find_library"; } - cmTypeMacro(cmFindLibraryCommand, cmFindBase); - protected: void AddArchitecturePaths(const char* suffix); void AddArchitecturePath(std::string const& dir, diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h index 501a5a5eeb..101749e895 100644 --- a/Source/cmFindPackageCommand.h +++ b/Source/cmFindPackageCommand.h @@ -60,8 +60,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "find_package"; } - cmTypeMacro(cmFindPackageCommand, cmFindCommon); - private: class PathLabel : public cmFindCommon::PathLabel { diff --git a/Source/cmFindPathCommand.h b/Source/cmFindPathCommand.h index 58cc0f3a35..4ba67ed402 100644 --- a/Source/cmFindPathCommand.h +++ b/Source/cmFindPathCommand.h @@ -38,7 +38,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "find_path"; } - cmTypeMacro(cmFindPathCommand, cmFindBase); bool IncludeFileInPath; private: diff --git a/Source/cmFindProgramCommand.h b/Source/cmFindProgramCommand.h index 2d88b79b48..4326124832 100644 --- a/Source/cmFindProgramCommand.h +++ b/Source/cmFindProgramCommand.h @@ -39,8 +39,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "find_program"; } - cmTypeMacro(cmFindProgramCommand, cmFindBase); - private: std::string FindProgram(); std::string FindNormalProgram(); diff --git a/Source/cmForEachCommand.h b/Source/cmForEachCommand.h index 1e3d786869..9ba4af036f 100644 --- a/Source/cmForEachCommand.h +++ b/Source/cmForEachCommand.h @@ -51,8 +51,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "foreach"; } - cmTypeMacro(cmForEachCommand, cmCommand); - private: bool HandleInMode(std::vector<std::string> const& args); }; diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx index 99d883aaaa..21e0c256bf 100644 --- a/Source/cmFunctionCommand.cxx +++ b/Source/cmFunctionCommand.cxx @@ -14,12 +14,9 @@ public: ~cmFunctionHelperCommand() CM_OVERRIDE {} /** - * This is used to avoid including this command - * in documentation. This is mainly used by - * cmMacroHelperCommand and cmFunctionHelperCommand - * which cannot provide appropriate documentation. + * This determines if the command is defined in a cmake script. */ - bool ShouldAppearInDocumentation() const CM_OVERRIDE { return false; } + bool IsUserDefined() const CM_OVERRIDE { return true; } /** * This is a virtual constructor for the command. @@ -58,8 +55,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return this->Args[0]; } - cmTypeMacro(cmFunctionHelperCommand, cmCommand); - std::vector<std::string> Args; std::vector<cmListFileFunction> Functions; cmPolicies::PolicyMap Policies; diff --git a/Source/cmFunctionCommand.h b/Source/cmFunctionCommand.h index 277708b550..7d868b2967 100644 --- a/Source/cmFunctionCommand.h +++ b/Source/cmFunctionCommand.h @@ -46,8 +46,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "function"; } - - cmTypeMacro(cmFunctionCommand, cmCommand); }; #endif diff --git a/Source/cmGetCMakePropertyCommand.h b/Source/cmGetCMakePropertyCommand.h index 644db3330c..30bc2d8140 100644 --- a/Source/cmGetCMakePropertyCommand.h +++ b/Source/cmGetCMakePropertyCommand.h @@ -26,8 +26,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "get_cmake_property"; } - - cmTypeMacro(cmGetCMakePropertyCommand, cmCommand); }; #endif diff --git a/Source/cmGetDirectoryPropertyCommand.h b/Source/cmGetDirectoryPropertyCommand.h index c6d932908f..625adb0361 100644 --- a/Source/cmGetDirectoryPropertyCommand.h +++ b/Source/cmGetDirectoryPropertyCommand.h @@ -27,8 +27,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "get_directory_property"; } - cmTypeMacro(cmGetDirectoryPropertyCommand, cmCommand); - private: void StoreResult(const std::string& variable, const char* prop); }; diff --git a/Source/cmGetFilenameComponentCommand.h b/Source/cmGetFilenameComponentCommand.h index 32096d19d9..68bf31f593 100644 --- a/Source/cmGetFilenameComponentCommand.h +++ b/Source/cmGetFilenameComponentCommand.h @@ -35,8 +35,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "get_filename_component"; } - - cmTypeMacro(cmGetFilenameComponentCommand, cmCommand); }; #endif diff --git a/Source/cmGetPropertyCommand.h b/Source/cmGetPropertyCommand.h index ee614165c0..20268b4696 100644 --- a/Source/cmGetPropertyCommand.h +++ b/Source/cmGetPropertyCommand.h @@ -29,8 +29,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "get_property"; } - cmTypeMacro(cmGetPropertyCommand, cmCommand); - private: enum OutType { diff --git a/Source/cmGetSourceFilePropertyCommand.h b/Source/cmGetSourceFilePropertyCommand.h index 184b3ce366..1edc392c94 100644 --- a/Source/cmGetSourceFilePropertyCommand.h +++ b/Source/cmGetSourceFilePropertyCommand.h @@ -24,8 +24,6 @@ public: { return "get_source_file_property"; } - - cmTypeMacro(cmGetSourceFilePropertyCommand, cmCommand); }; #endif diff --git a/Source/cmGetTargetPropertyCommand.h b/Source/cmGetTargetPropertyCommand.h index f16dea7076..f36cc4891c 100644 --- a/Source/cmGetTargetPropertyCommand.h +++ b/Source/cmGetTargetPropertyCommand.h @@ -21,8 +21,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "get_target_property"; } - - cmTypeMacro(cmGetTargetPropertyCommand, cmCommand); }; #endif diff --git a/Source/cmGetTestPropertyCommand.h b/Source/cmGetTestPropertyCommand.h index 527ee1a96c..5dc89bddb8 100644 --- a/Source/cmGetTestPropertyCommand.h +++ b/Source/cmGetTestPropertyCommand.h @@ -21,8 +21,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "get_test_property"; } - - cmTypeMacro(cmGetTestPropertyCommand, cmCommand); }; #endif diff --git a/Source/cmIfCommand.h b/Source/cmIfCommand.h index f449023f99..e071acb0c0 100644 --- a/Source/cmIfCommand.h +++ b/Source/cmIfCommand.h @@ -66,8 +66,6 @@ public: // Filter the given variable definition based on policy CMP0054. static const char* GetDefinitionIfUnquoted( const cmMakefile* mf, cmExpandedCommandArgument const& argument); - - cmTypeMacro(cmIfCommand, cmCommand); }; #endif diff --git a/Source/cmIncludeCommand.h b/Source/cmIncludeCommand.h index 7ff7b9d798..9065ef7b82 100644 --- a/Source/cmIncludeCommand.h +++ b/Source/cmIncludeCommand.h @@ -35,8 +35,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "include"; } - - cmTypeMacro(cmIncludeCommand, cmCommand); }; #endif diff --git a/Source/cmIncludeDirectoryCommand.h b/Source/cmIncludeDirectoryCommand.h index 46e433a0fa..d0a20b379a 100644 --- a/Source/cmIncludeDirectoryCommand.h +++ b/Source/cmIncludeDirectoryCommand.h @@ -31,8 +31,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "include_directories"; } - cmTypeMacro(cmIncludeDirectoryCommand, cmCommand); - protected: // used internally void GetIncludes(const std::string& arg, std::vector<std::string>& incs); diff --git a/Source/cmIncludeExternalMSProjectCommand.h b/Source/cmIncludeExternalMSProjectCommand.h index 9401016618..4f8ec81504 100644 --- a/Source/cmIncludeExternalMSProjectCommand.h +++ b/Source/cmIncludeExternalMSProjectCommand.h @@ -37,8 +37,6 @@ public: { return "include_external_msproject"; } - - cmTypeMacro(cmIncludeExternalMSProjectCommand, cmCommand); }; #endif diff --git a/Source/cmIncludeRegularExpressionCommand.h b/Source/cmIncludeRegularExpressionCommand.h index 648bce2782..b7c937d13b 100644 --- a/Source/cmIncludeRegularExpressionCommand.h +++ b/Source/cmIncludeRegularExpressionCommand.h @@ -36,8 +36,6 @@ public: { return "include_regular_expression"; } - - cmTypeMacro(cmIncludeRegularExpressionCommand, cmCommand); }; #endif diff --git a/Source/cmInstallCommand.h b/Source/cmInstallCommand.h index 6f785ae34a..b350330059 100644 --- a/Source/cmInstallCommand.h +++ b/Source/cmInstallCommand.h @@ -31,8 +31,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "install"; } - cmTypeMacro(cmInstallCommand, cmCommand); - private: bool HandleScriptMode(std::vector<std::string> const& args); bool HandleTargetsMode(std::vector<std::string> const& args); diff --git a/Source/cmInstallFilesCommand.h b/Source/cmInstallFilesCommand.h index a80184abb9..da09fae448 100644 --- a/Source/cmInstallFilesCommand.h +++ b/Source/cmInstallFilesCommand.h @@ -40,8 +40,6 @@ public: void FinalPass() CM_OVERRIDE; bool HasFinalPass() const CM_OVERRIDE { return !this->IsFilesForm; } - cmTypeMacro(cmInstallFilesCommand, cmCommand); - protected: void CreateInstallGenerator() const; std::string FindInstallSource(const char* name) const; diff --git a/Source/cmInstallProgramsCommand.h b/Source/cmInstallProgramsCommand.h index cb85cce036..1fb7d91cf5 100644 --- a/Source/cmInstallProgramsCommand.h +++ b/Source/cmInstallProgramsCommand.h @@ -41,8 +41,6 @@ public: bool HasFinalPass() const CM_OVERRIDE { return true; } - cmTypeMacro(cmInstallProgramsCommand, cmCommand); - protected: std::string FindInstallSource(const char* name) const; diff --git a/Source/cmInstallTargetsCommand.h b/Source/cmInstallTargetsCommand.h index 2ddeaf0861..0625722ec3 100644 --- a/Source/cmInstallTargetsCommand.h +++ b/Source/cmInstallTargetsCommand.h @@ -31,8 +31,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "install_targets"; } - - cmTypeMacro(cmInstallTargetsCommand, cmCommand); }; #endif diff --git a/Source/cmLinkDirectoriesCommand.h b/Source/cmLinkDirectoriesCommand.h index cd6d2deb59..ba0313b63d 100644 --- a/Source/cmLinkDirectoriesCommand.h +++ b/Source/cmLinkDirectoriesCommand.h @@ -33,8 +33,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "link_directories"; } - cmTypeMacro(cmLinkDirectoriesCommand, cmCommand); - private: void AddLinkDir(std::string const& dir); }; diff --git a/Source/cmLinkLibrariesCommand.h b/Source/cmLinkLibrariesCommand.h index b4943b6f87..75a31c8f29 100644 --- a/Source/cmLinkLibrariesCommand.h +++ b/Source/cmLinkLibrariesCommand.h @@ -31,8 +31,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "link_libraries"; } - - cmTypeMacro(cmLinkLibrariesCommand, cmCommand); }; #endif diff --git a/Source/cmListCommand.h b/Source/cmListCommand.h index b6b0a47fcf..43a482ca9a 100644 --- a/Source/cmListCommand.h +++ b/Source/cmListCommand.h @@ -34,8 +34,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "list"; } - cmTypeMacro(cmListCommand, cmCommand); - protected: bool HandleLengthCommand(std::vector<std::string> const& args); bool HandleGetCommand(std::vector<std::string> const& args); diff --git a/Source/cmLoadCacheCommand.h b/Source/cmLoadCacheCommand.h index 57f64cdcce..0b57a61acd 100644 --- a/Source/cmLoadCacheCommand.h +++ b/Source/cmLoadCacheCommand.h @@ -30,8 +30,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "load_cache"; } - cmTypeMacro(cmLoadCacheCommand, cmCommand); - protected: std::set<std::string> VariablesToRead; std::string Prefix; diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx index bcfec797cb..ed4e009798 100644 --- a/Source/cmLoadCommandCommand.cxx +++ b/Source/cmLoadCommandCommand.cxx @@ -93,8 +93,6 @@ public: } } - cmTypeMacro(cmLoadedCommand, cmCommand); - cmLoadedCommandInfo info; }; diff --git a/Source/cmLoadCommandCommand.h b/Source/cmLoadCommandCommand.h index e42d46ace0..9628464b1e 100644 --- a/Source/cmLoadCommandCommand.h +++ b/Source/cmLoadCommandCommand.h @@ -12,7 +12,6 @@ public: bool InitialPass(std::vector<std::string> const& args, cmExecutionStatus& status) CM_OVERRIDE; std::string GetName() const CM_OVERRIDE { return "load_command"; } - cmTypeMacro(cmLoadCommandCommand, cmCommand); }; #endif diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx index 9917394a73..a8446d9670 100644 --- a/Source/cmMacroCommand.cxx +++ b/Source/cmMacroCommand.cxx @@ -15,12 +15,9 @@ public: ~cmMacroHelperCommand() CM_OVERRIDE {} /** - * This is used to avoid including this command - * in documentation. This is mainly used by - * cmMacroHelperCommand and cmFunctionHelperCommand - * which cannot provide appropriate documentation. + * This determines if the command is defined in a cmake script. */ - bool ShouldAppearInDocumentation() const CM_OVERRIDE { return false; } + bool IsUserDefined() const CM_OVERRIDE { return true; } /** * This is a virtual constructor for the command. @@ -59,8 +56,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return this->Args[0]; } - cmTypeMacro(cmMacroHelperCommand, cmCommand); - std::vector<std::string> Args; std::vector<cmListFileFunction> Functions; cmPolicies::PolicyMap Policies; diff --git a/Source/cmMacroCommand.h b/Source/cmMacroCommand.h index 362d272a20..8e3cd95a9a 100644 --- a/Source/cmMacroCommand.h +++ b/Source/cmMacroCommand.h @@ -46,8 +46,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "macro"; } - - cmTypeMacro(cmMacroCommand, cmCommand); }; #endif diff --git a/Source/cmMakeDirectoryCommand.h b/Source/cmMakeDirectoryCommand.h index 2117fae1dd..74b4a6361b 100644 --- a/Source/cmMakeDirectoryCommand.h +++ b/Source/cmMakeDirectoryCommand.h @@ -38,8 +38,6 @@ public: * This determines if the command is invoked when in script mode. */ bool IsScriptable() const CM_OVERRIDE { return true; } - - cmTypeMacro(cmMakeDirectoryCommand, cmCommand); }; #endif diff --git a/Source/cmMarkAsAdvancedCommand.h b/Source/cmMarkAsAdvancedCommand.h index 54fa78adcd..0f5270cd65 100644 --- a/Source/cmMarkAsAdvancedCommand.h +++ b/Source/cmMarkAsAdvancedCommand.h @@ -37,8 +37,6 @@ public: * FindUnixMake.cmake used by the CTEST_BUILD command. */ bool IsScriptable() const CM_OVERRIDE { return true; } - - cmTypeMacro(cmMarkAsAdvancedCommand, cmCommand); }; #endif diff --git a/Source/cmMathCommand.h b/Source/cmMathCommand.h index 6fa7389483..17a1575e6b 100644 --- a/Source/cmMathCommand.h +++ b/Source/cmMathCommand.h @@ -31,8 +31,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "math"; } - cmTypeMacro(cmMathCommand, cmCommand); - protected: bool HandleExprCommand(std::vector<std::string> const& args); }; diff --git a/Source/cmMessageCommand.h b/Source/cmMessageCommand.h index a67d52bbbc..cd16ffa09d 100644 --- a/Source/cmMessageCommand.h +++ b/Source/cmMessageCommand.h @@ -33,8 +33,6 @@ public: * This determines if the command is invoked when in script mode. */ bool IsScriptable() const CM_OVERRIDE { return true; } - - cmTypeMacro(cmMessageCommand, cmCommand); }; #endif diff --git a/Source/cmOptionCommand.h b/Source/cmOptionCommand.h index 3ca62d7d1e..d77215a579 100644 --- a/Source/cmOptionCommand.h +++ b/Source/cmOptionCommand.h @@ -34,8 +34,6 @@ public: * This determines if the command is invoked when in script mode. */ bool IsScriptable() const CM_OVERRIDE { return true; } - - cmTypeMacro(cmOptionCommand, cmCommand); }; #endif diff --git a/Source/cmOutputRequiredFilesCommand.h b/Source/cmOutputRequiredFilesCommand.h index 7a81a76158..8b7104b66b 100644 --- a/Source/cmOutputRequiredFilesCommand.h +++ b/Source/cmOutputRequiredFilesCommand.h @@ -10,7 +10,6 @@ class cmDependInformation; class cmOutputRequiredFilesCommand : public cmCommand { public: - cmTypeMacro(cmOutputRequiredFilesCommand, cmCommand); cmCommand* Clone() CM_OVERRIDE { return new cmOutputRequiredFilesCommand; } bool InitialPass(std::vector<std::string> const& args, cmExecutionStatus& status) CM_OVERRIDE; diff --git a/Source/cmParseArgumentsCommand.h b/Source/cmParseArgumentsCommand.h index fbeb3df060..af87d81c80 100644 --- a/Source/cmParseArgumentsCommand.h +++ b/Source/cmParseArgumentsCommand.h @@ -32,8 +32,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "cmake_parse_arguments"; } - - cmTypeMacro(cmParseArgumentsCommand, cmCommand); }; #endif diff --git a/Source/cmProjectCommand.h b/Source/cmProjectCommand.h index c9c2549990..ef554f3d6b 100644 --- a/Source/cmProjectCommand.h +++ b/Source/cmProjectCommand.h @@ -32,8 +32,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "project"; } - - cmTypeMacro(cmProjectCommand, cmCommand); }; #endif diff --git a/Source/cmQTWrapCPPCommand.h b/Source/cmQTWrapCPPCommand.h index 3567fb6954..afcaf6993f 100644 --- a/Source/cmQTWrapCPPCommand.h +++ b/Source/cmQTWrapCPPCommand.h @@ -16,8 +16,6 @@ class cmQTWrapCPPCommand : public cmCommand { public: - cmTypeMacro(cmQTWrapCPPCommand, cmCommand); - /** * This is a virtual constructor for the command. */ diff --git a/Source/cmQTWrapUICommand.h b/Source/cmQTWrapUICommand.h index 84b88a8f80..8efa7478b5 100644 --- a/Source/cmQTWrapUICommand.h +++ b/Source/cmQTWrapUICommand.h @@ -15,7 +15,6 @@ class cmQTWrapUICommand : public cmCommand { public: - cmTypeMacro(cmQTWrapUICommand, cmCommand); /** * This is a virtual constructor for the command. */ diff --git a/Source/cmRemoveCommand.h b/Source/cmRemoveCommand.h index bf33de0a7d..d7b2a6538a 100644 --- a/Source/cmRemoveCommand.h +++ b/Source/cmRemoveCommand.h @@ -34,8 +34,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "remove"; } - - cmTypeMacro(cmRemoveCommand, cmCommand); }; #endif diff --git a/Source/cmRemoveDefinitionsCommand.h b/Source/cmRemoveDefinitionsCommand.h index 016f5fd1c3..67dcfeee14 100644 --- a/Source/cmRemoveDefinitionsCommand.h +++ b/Source/cmRemoveDefinitionsCommand.h @@ -31,8 +31,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "remove_definitions"; } - - cmTypeMacro(cmRemoveDefinitionsCommand, cmCommand); }; #endif diff --git a/Source/cmReturnCommand.h b/Source/cmReturnCommand.h index 1159e78600..06b91bc49e 100644 --- a/Source/cmReturnCommand.h +++ b/Source/cmReturnCommand.h @@ -34,8 +34,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "return"; } - - cmTypeMacro(cmReturnCommand, cmCommand); }; #endif diff --git a/Source/cmSeparateArgumentsCommand.h b/Source/cmSeparateArgumentsCommand.h index 66fbef7263..d80d04354f 100644 --- a/Source/cmSeparateArgumentsCommand.h +++ b/Source/cmSeparateArgumentsCommand.h @@ -34,8 +34,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "separate_arguments"; } - - cmTypeMacro(cmSeparateArgumentsCommand, cmCommand); }; #endif diff --git a/Source/cmSetCommand.h b/Source/cmSetCommand.h index 94f7cf09ae..6fa3865196 100644 --- a/Source/cmSetCommand.h +++ b/Source/cmSetCommand.h @@ -34,8 +34,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "set"; } - - cmTypeMacro(cmSetCommand, cmCommand); }; #endif diff --git a/Source/cmSetDirectoryPropertiesCommand.h b/Source/cmSetDirectoryPropertiesCommand.h index 9abefdaf87..9608742b33 100644 --- a/Source/cmSetDirectoryPropertiesCommand.h +++ b/Source/cmSetDirectoryPropertiesCommand.h @@ -40,8 +40,6 @@ public: std::vector<std::string>::const_iterator ait, std::vector<std::string>::const_iterator aitend, std::string& errors); - - cmTypeMacro(cmSetDirectoryPropertiesCommand, cmCommand); }; #endif diff --git a/Source/cmSetPropertyCommand.h b/Source/cmSetPropertyCommand.h index 01295c1e06..b4dff768d6 100644 --- a/Source/cmSetPropertyCommand.h +++ b/Source/cmSetPropertyCommand.h @@ -29,8 +29,6 @@ public: */ bool IsScriptable() const CM_OVERRIDE { return true; } - cmTypeMacro(cmSetPropertyCommand, cmCommand); - private: std::set<std::string> Names; std::string PropertyName; diff --git a/Source/cmSetSourceFilesPropertiesCommand.h b/Source/cmSetSourceFilesPropertiesCommand.h index c683ac0a01..62cc40487f 100644 --- a/Source/cmSetSourceFilesPropertiesCommand.h +++ b/Source/cmSetSourceFilesPropertiesCommand.h @@ -28,8 +28,6 @@ public: return "set_source_files_properties"; } - cmTypeMacro(cmSetSourceFilesPropertiesCommand, cmCommand); - static bool RunCommand(cmMakefile* mf, std::vector<std::string>::const_iterator filebeg, std::vector<std::string>::const_iterator fileend, diff --git a/Source/cmSetTargetPropertiesCommand.h b/Source/cmSetTargetPropertiesCommand.h index 6e2a24214e..ed02fa86f9 100644 --- a/Source/cmSetTargetPropertiesCommand.h +++ b/Source/cmSetTargetPropertiesCommand.h @@ -28,8 +28,6 @@ public: static bool SetOneTarget(const std::string& tname, std::vector<std::string>& propertyPairs, cmMakefile* mf); - - cmTypeMacro(cmSetTargetPropertiesCommand, cmCommand); }; #endif diff --git a/Source/cmSetTestsPropertiesCommand.h b/Source/cmSetTestsPropertiesCommand.h index 3f5ce21797..04ba76e4bf 100644 --- a/Source/cmSetTestsPropertiesCommand.h +++ b/Source/cmSetTestsPropertiesCommand.h @@ -22,8 +22,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "set_tests_properties"; } - cmTypeMacro(cmSetTestsPropertiesCommand, cmCommand); - static bool SetOneTest(const std::string& tname, std::vector<std::string>& propertyPairs, cmMakefile* mf, std::string& errors); diff --git a/Source/cmSiteNameCommand.h b/Source/cmSiteNameCommand.h index 5578b03517..48d1035fc5 100644 --- a/Source/cmSiteNameCommand.h +++ b/Source/cmSiteNameCommand.h @@ -34,8 +34,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "site_name"; } - - cmTypeMacro(cmSiteNameCommand, cmCommand); }; #endif diff --git a/Source/cmSourceGroupCommand.h b/Source/cmSourceGroupCommand.h index e3639df614..deee740406 100644 --- a/Source/cmSourceGroupCommand.h +++ b/Source/cmSourceGroupCommand.h @@ -30,8 +30,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "source_group"; } - - cmTypeMacro(cmSourceGroupCommand, cmCommand); }; #endif diff --git a/Source/cmState.cxx b/Source/cmState.cxx index 0d1eb3eb5c..468b191e4c 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -446,8 +446,7 @@ void cmState::RemoveUserDefinedCommands() std::vector<cmCommand*> renamedCommands; for (std::map<std::string, cmCommand*>::iterator j = this->Commands.begin(); j != this->Commands.end();) { - if (j->second->IsA("cmMacroHelperCommand") || - j->second->IsA("cmFunctionHelperCommand")) { + if (j->second->IsUserDefined()) { delete j->second; this->Commands.erase(j++); } else if (j->first != j->second->GetName()) { diff --git a/Source/cmStringCommand.h b/Source/cmStringCommand.h index edb138d232..b928f3caef 100644 --- a/Source/cmStringCommand.h +++ b/Source/cmStringCommand.h @@ -39,8 +39,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "string"; } - cmTypeMacro(cmStringCommand, cmCommand); - protected: bool HandleConfigureCommand(std::vector<std::string> const& args); bool HandleAsciiCommand(std::vector<std::string> const& args); diff --git a/Source/cmSubdirCommand.h b/Source/cmSubdirCommand.h index c425852d2c..077863862a 100644 --- a/Source/cmSubdirCommand.h +++ b/Source/cmSubdirCommand.h @@ -31,8 +31,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "subdirs"; } - - cmTypeMacro(cmSubdirCommand, cmCommand); }; #endif diff --git a/Source/cmSubdirDependsCommand.h b/Source/cmSubdirDependsCommand.h index 0f3deb671d..097244d769 100644 --- a/Source/cmSubdirDependsCommand.h +++ b/Source/cmSubdirDependsCommand.h @@ -12,7 +12,6 @@ public: bool InitialPass(std::vector<std::string> const& args, cmExecutionStatus& status) CM_OVERRIDE; std::string GetName() const CM_OVERRIDE { return "subdir_depends"; } - cmTypeMacro(cmSubdirDependsCommand, cmCommand); }; #endif diff --git a/Source/cmTargetCompileDefinitionsCommand.h b/Source/cmTargetCompileDefinitionsCommand.h index b49f6162da..0aaad4ecc2 100644 --- a/Source/cmTargetCompileDefinitionsCommand.h +++ b/Source/cmTargetCompileDefinitionsCommand.h @@ -31,8 +31,6 @@ public: return "target_compile_definitions"; } - cmTypeMacro(cmTargetCompileDefinitionsCommand, cmTargetPropCommandBase); - private: void HandleImportedTarget(const std::string& tgt) CM_OVERRIDE; void HandleMissingTarget(const std::string& name) CM_OVERRIDE; diff --git a/Source/cmTargetCompileFeaturesCommand.h b/Source/cmTargetCompileFeaturesCommand.h index 8273e025e7..00c84d7acc 100644 --- a/Source/cmTargetCompileFeaturesCommand.h +++ b/Source/cmTargetCompileFeaturesCommand.h @@ -14,8 +14,6 @@ class cmTargetCompileFeaturesCommand : public cmTargetPropCommandBase std::string GetName() const CM_OVERRIDE { return "target_compile_features"; } - cmTypeMacro(cmTargetCompileFeaturesCommand, cmTargetPropCommandBase); - private: void HandleImportedTarget(const std::string& tgt) CM_OVERRIDE; void HandleMissingTarget(const std::string& name) CM_OVERRIDE; diff --git a/Source/cmTargetCompileOptionsCommand.h b/Source/cmTargetCompileOptionsCommand.h index f5b4c706c6..06b05a2d68 100644 --- a/Source/cmTargetCompileOptionsCommand.h +++ b/Source/cmTargetCompileOptionsCommand.h @@ -25,8 +25,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "target_compile_options"; } - cmTypeMacro(cmTargetCompileOptionsCommand, cmTargetPropCommandBase); - private: void HandleImportedTarget(const std::string& tgt) CM_OVERRIDE; void HandleMissingTarget(const std::string& name) CM_OVERRIDE; diff --git a/Source/cmTargetIncludeDirectoriesCommand.h b/Source/cmTargetIncludeDirectoriesCommand.h index 671627a561..d96b28a54c 100644 --- a/Source/cmTargetIncludeDirectoriesCommand.h +++ b/Source/cmTargetIncludeDirectoriesCommand.h @@ -31,8 +31,6 @@ public: return "target_include_directories"; } - cmTypeMacro(cmTargetIncludeDirectoriesCommand, cmTargetPropCommandBase); - private: void HandleImportedTarget(const std::string& tgt) CM_OVERRIDE; void HandleMissingTarget(const std::string& name) CM_OVERRIDE; diff --git a/Source/cmTargetLinkLibrariesCommand.h b/Source/cmTargetLinkLibrariesCommand.h index 85888f9848..69bb6ebc89 100644 --- a/Source/cmTargetLinkLibrariesCommand.h +++ b/Source/cmTargetLinkLibrariesCommand.h @@ -32,8 +32,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "target_link_libraries"; } - cmTypeMacro(cmTargetLinkLibrariesCommand, cmCommand); - private: void LinkLibraryTypeSpecifierWarning(int left, int right); static const char* LinkLibraryTypeNames[3]; diff --git a/Source/cmTargetPropCommandBase.h b/Source/cmTargetPropCommandBase.h index de0a7d3e69..485a7f377e 100644 --- a/Source/cmTargetPropCommandBase.h +++ b/Source/cmTargetPropCommandBase.h @@ -21,8 +21,6 @@ public: const std::string& prop, ArgumentFlags flags = NO_FLAGS); - cmTypeMacro(cmTargetPropCommandBase, cmCommand); - protected: std::string Property; cmTarget* Target; diff --git a/Source/cmTargetSourcesCommand.h b/Source/cmTargetSourcesCommand.h index 8f88b25f8c..839f07c3c3 100644 --- a/Source/cmTargetSourcesCommand.h +++ b/Source/cmTargetSourcesCommand.h @@ -25,8 +25,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "target_sources"; } - cmTypeMacro(cmTargetSourcesCommand, cmTargetPropCommandBase); - private: void HandleImportedTarget(const std::string& tgt) CM_OVERRIDE; void HandleMissingTarget(const std::string& name) CM_OVERRIDE; diff --git a/Source/cmTryCompileCommand.h b/Source/cmTryCompileCommand.h index 45d92df0b7..ed74ae12ab 100644 --- a/Source/cmTryCompileCommand.h +++ b/Source/cmTryCompileCommand.h @@ -29,8 +29,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "try_compile"; } - - cmTypeMacro(cmTryCompileCommand, cmCoreTryCompile); }; #endif diff --git a/Source/cmTryRunCommand.h b/Source/cmTryRunCommand.h index b569b0be9c..24447edb92 100644 --- a/Source/cmTryRunCommand.h +++ b/Source/cmTryRunCommand.h @@ -30,8 +30,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "try_run"; } - cmTypeMacro(cmTryRunCommand, cmCoreTryCompile); - private: void RunExecutable(const std::string& runArgs, std::string* runOutputContents); diff --git a/Source/cmUnsetCommand.h b/Source/cmUnsetCommand.h index b3f045a936..37b9270e6c 100644 --- a/Source/cmUnsetCommand.h +++ b/Source/cmUnsetCommand.h @@ -34,8 +34,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "unset"; } - - cmTypeMacro(cmUnsetCommand, cmCommand); }; #endif diff --git a/Source/cmUseMangledMesaCommand.h b/Source/cmUseMangledMesaCommand.h index a5fa146f58..32003277ea 100644 --- a/Source/cmUseMangledMesaCommand.h +++ b/Source/cmUseMangledMesaCommand.h @@ -8,7 +8,6 @@ class cmUseMangledMesaCommand : public cmCommand { public: - cmTypeMacro(cmUseMangledMesaCommand, cmCommand); cmCommand* Clone() CM_OVERRIDE { return new cmUseMangledMesaCommand; } bool InitialPass(std::vector<std::string> const& args, cmExecutionStatus& status) CM_OVERRIDE; diff --git a/Source/cmUtilitySourceCommand.h b/Source/cmUtilitySourceCommand.h index 6ee5f3ead8..3c28e11859 100644 --- a/Source/cmUtilitySourceCommand.h +++ b/Source/cmUtilitySourceCommand.h @@ -8,7 +8,6 @@ class cmUtilitySourceCommand : public cmCommand { public: - cmTypeMacro(cmUtilitySourceCommand, cmCommand); cmCommand* Clone() CM_OVERRIDE { return new cmUtilitySourceCommand; } bool InitialPass(std::vector<std::string> const& args, cmExecutionStatus& status) CM_OVERRIDE; diff --git a/Source/cmVariableRequiresCommand.h b/Source/cmVariableRequiresCommand.h index e40151b30b..92878bae02 100644 --- a/Source/cmVariableRequiresCommand.h +++ b/Source/cmVariableRequiresCommand.h @@ -8,7 +8,6 @@ class cmVariableRequiresCommand : public cmCommand { public: - cmTypeMacro(cmVariableRequiresCommand, cmCommand); cmCommand* Clone() CM_OVERRIDE { return new cmVariableRequiresCommand; } bool InitialPass(std::vector<std::string> const& args, cmExecutionStatus& status) CM_OVERRIDE; diff --git a/Source/cmVariableWatchCommand.h b/Source/cmVariableWatchCommand.h index b1862f0235..8518fd2ebd 100644 --- a/Source/cmVariableWatchCommand.h +++ b/Source/cmVariableWatchCommand.h @@ -44,8 +44,6 @@ public: */ std::string GetName() const CM_OVERRIDE { return "variable_watch"; } - cmTypeMacro(cmVariableWatchCommand, cmCommand); - protected: std::set<std::string> WatchedVariables; }; diff --git a/Source/cmWhileCommand.h b/Source/cmWhileCommand.h index 9c70ca2b9f..cc114eca2b 100644 --- a/Source/cmWhileCommand.h +++ b/Source/cmWhileCommand.h @@ -60,8 +60,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "while"; } - - cmTypeMacro(cmWhileCommand, cmCommand); }; #endif diff --git a/Source/cmWriteFileCommand.h b/Source/cmWriteFileCommand.h index dbadf841cd..76a0536a66 100644 --- a/Source/cmWriteFileCommand.h +++ b/Source/cmWriteFileCommand.h @@ -33,8 +33,6 @@ public: * The name of the command as specified in CMakeList.txt. */ std::string GetName() const CM_OVERRIDE { return "write_file"; } - - cmTypeMacro(cmWriteFileCommand, cmCommand); }; #endif |