echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make cmCommand not inherit from cmObject

Browse Source
This commit is contained in:
Daniel Pfeifer 2016-10-23 00:45:08 +02:00
parent 1e555a44aa
commit 9855ebf11a
129 changed files with 13 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CTest/cmCTestBuildCommand.h
View File

@ -47,8 +47,6 @@ public:
bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus& status) CM_OVERRIDE;
cmTypeMacro(cmCTestBuildCommand, cmCTestHandlerCommand);
cmGlobalGenerator* GlobalGenerator;
protected:

2
Source/CTest/cmCTestCommand.h
View File

@ -26,8 +26,6 @@ public:
cmCTest* CTest;
cmCTestScriptHandler* CTestScriptHandler;
cmTypeMacro(cmCTestCommand, cmCommand);
};
#endif

2
Source/CTest/cmCTestConfigureCommand.h
View File

@ -39,8 +39,6 @@ public:
*/
std::string GetName() const CM_OVERRIDE { return "ctest_configure"; }
cmTypeMacro(cmCTestConfigureCommand, cmCTestHandlerCommand);
protected:
cmCTestGenericHandler* InitializeHandler() CM_OVERRIDE;

2
Source/CTest/cmCTestCoverageCommand.h
View File

@ -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;

2
Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h
View File

@ -51,8 +51,6 @@ public:
{
return "ctest_empty_binary_directory";
}
cmTypeMacro(cmCTestEmptyBinaryDirectoryCommand, cmCTestCommand);
};
#endif

2
Source/CTest/cmCTestHandlerCommand.h
View File

@ -32,8 +32,6 @@ public:
bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus& status) CM_OVERRIDE;
cmTypeMacro(cmCTestHandlerCommand, cmCTestCommand);
enum
{
ct_NONE,

2
Source/CTest/cmCTestMemCheckCommand.h
View File

@ -39,8 +39,6 @@ public:
*/
std::string GetName() const CM_OVERRIDE { return "ctest_memcheck"; }
cmTypeMacro(cmCTestMemCheckCommand, cmCTestTestCommand);
protected:
cmCTestGenericHandler* InitializeActualHandler() CM_OVERRIDE;
};

2
Source/CTest/cmCTestReadCustomFilesCommand.h
View File

@ -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

2
Source/CTest/cmCTestRunScriptCommand.h
View File

@ -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

2
Source/CTest/cmCTestSleepCommand.h
View File

@ -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

2
Source/CTest/cmCTestStartCommand.h
View File

@ -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;

2
Source/CTest/cmCTestSubmitCommand.h
View File

@ -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;

2
Source/CTest/cmCTestTestCommand.h
View File

@ -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;

8
Source/CTest/cmCTestTestHandler.cxx
View File

@ -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;
};

2
Source/CTest/cmCTestUpdateCommand.h
View File

@ -39,8 +39,6 @@ public:
*/
std::string GetName() const CM_OVERRIDE { return "ctest_update"; }
cmTypeMacro(cmCTestUpdateCommand, cmCTestHandlerCommand);
protected:
cmCTestGenericHandler* InitializeHandler() CM_OVERRIDE;
};

2
Source/CTest/cmCTestUploadCommand.h
View File

@ -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;

2
Source/cmAddCompileOptionsCommand.h
View File

@ -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

2
Source/cmAddCustomCommandCommand.h
View File

@ -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);
};

2
Source/cmAddCustomTargetCommand.h
View File

@ -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

2
Source/cmAddDefinitionsCommand.h
View File

@ -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

2
Source/cmAddDependenciesCommand.h
View File

@ -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

2
Source/cmAddExecutableCommand.h
View File

@ -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

2
Source/cmAddLibraryCommand.h
View File

@ -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

2
Source/cmAddSubDirectoryCommand.h
View File

@ -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

2
Source/cmAddTestCommand.h
View File

@ -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);
};

2
Source/cmAuxSourceDirectoryCommand.h
View File

@ -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

2
Source/cmBreakCommand.h
View File

@ -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

2
Source/cmBuildCommand.h
View File

@ -40,8 +40,6 @@ public:
*/
std::string GetName() const CM_OVERRIDE { return "build_command"; }
cmTypeMacro(cmBuildCommand, cmCommand);
private:
bool IgnoreErrors() const;
};

1
Source/cmBuildNameCommand.h
View File

@ -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;

2
Source/cmCMakeHostSystemInformationCommand.h
View File

@ -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);

2
Source/cmCMakeMinimumRequired.h
View File

@ -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();

2
Source/cmCMakePolicyCommand.h
View File

@ -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);

14
Source/cmCommand.h
View File

@ -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.

2
Source/cmConfigureFileCommand.h
View File

@ -8,8 +8,6 @@
class cmConfigureFileCommand : public cmCommand
{
public:
cmTypeMacro(cmConfigureFileCommand, cmCommand);
cmCommand* Clone() CM_OVERRIDE { return new cmConfigureFileCommand; }
/**

2
Source/cmContinueCommand.h
View File

@ -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

2
Source/cmCoreTryCompile.h
View File

@ -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;

2
Source/cmCreateTestSourceList.h
View File

@ -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

2
Source/cmDefinePropertyCommand.h
View File

@ -22,8 +22,6 @@ public:
*/
std::string GetName() const CM_OVERRIDE { return "define_property"; }
cmTypeMacro(cmDefinePropertyCommand, cmCommand);
private:
std::string PropertyName;
std::string BriefDocs;

2
Source/cmElseCommand.h
View File

@ -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

2
Source/cmElseIfCommand.h
View File

@ -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

2
Source/cmEnableLanguageCommand.h
View File

@ -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

2
Source/cmEnableTestingCommand.h
View File

@ -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

2
Source/cmEndForEachCommand.h
View File

@ -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

2
Source/cmEndFunctionCommand.h
View File

@ -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

2
Source/cmEndIfCommand.h
View File

@ -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

2
Source/cmEndMacroCommand.h
View File

@ -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

2
Source/cmEndWhileCommand.h
View File

@ -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

2
Source/cmExecProgramCommand.h
View File

@ -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,

2
Source/cmExecuteProcessCommand.h
View File

@ -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

2
Source/cmExportCommand.h
View File

@ -35,8 +35,6 @@ public:
*/
std::string GetName() const CM_OVERRIDE { return "export"; }
cmTypeMacro(cmExportCommand, cmCommand);
private:
cmCommandArgumentGroup ArgumentGroup;
cmCAStringVector Targets;

1
Source/cmExportLibraryDependenciesCommand.h
View File

@ -8,7 +8,6 @@
class cmExportLibraryDependenciesCommand : public cmCommand
{
public:
cmTypeMacro(cmExportLibraryDependenciesCommand, cmCommand);
cmCommand* Clone() CM_OVERRIDE
{
return new cmExportLibraryDependenciesCommand;

2
Source/cmFLTKWrapUICommand.h
View File

@ -14,8 +14,6 @@
class cmFLTKWrapUICommand : public cmCommand
{
public:
cmTypeMacro(cmFLTKWrapUICommand, cmCommand);
/**
* This is a virtual constructor for the command.
*/

2
Source/cmFileCommand.h
View File

@ -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);

1
Source/cmFindBase.h
View File

@ -20,7 +20,6 @@ public:
* the CMakeLists.txt file.
*/
virtual bool ParseArguments(std::vector<std::string> const& args);
cmTypeMacro(cmFindBase, cmFindCommon);
protected:
void PrintFindStuff();

1
Source/cmFindCommon.h
View File

@ -19,7 +19,6 @@ class cmFindCommon : public cmCommand
public:
cmFindCommon();
~cmFindCommon() CM_OVERRIDE;
cmTypeMacro(cmFindCommon, cmCommand);
protected:
friend class cmSearchPath;

2
Source/cmFindFileCommand.h
View File

@ -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

2
Source/cmFindLibraryCommand.h
View File

@ -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,

2
Source/cmFindPackageCommand.h
View File

@ -60,8 +60,6 @@ public:
*/
std::string GetName() const CM_OVERRIDE { return "find_package"; }
cmTypeMacro(cmFindPackageCommand, cmFindCommon);
private:
class PathLabel : public cmFindCommon::PathLabel
{

1
Source/cmFindPathCommand.h
View File

@ -38,7 +38,6 @@ public:
*/
std::string GetName() const CM_OVERRIDE { return "find_path"; }
cmTypeMacro(cmFindPathCommand, cmFindBase);
bool IncludeFileInPath;
private:

2
Source/cmFindProgramCommand.h
View File

@ -39,8 +39,6 @@ public:
*/
std::string GetName() const CM_OVERRIDE { return "find_program"; }
cmTypeMacro(cmFindProgramCommand, cmFindBase);
private:
std::string FindProgram();
std::string FindNormalProgram();

2
Source/cmForEachCommand.h
View File

@ -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);
};

9
Source/cmFunctionCommand.cxx
View File

@ -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;

2
Source/cmFunctionCommand.h
View File

@ -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

2
Source/cmGetCMakePropertyCommand.h
View File

@ -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

2
Source/cmGetDirectoryPropertyCommand.h
View File

@ -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);
};

2
Source/cmGetFilenameComponentCommand.h
View File

@ -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

2
Source/cmGetPropertyCommand.h
View File

@ -29,8 +29,6 @@ public:
*/
std::string GetName() const CM_OVERRIDE { return "get_property"; }
cmTypeMacro(cmGetPropertyCommand, cmCommand);
private:
enum OutType
{

2
Source/cmGetSourceFilePropertyCommand.h
View File

@ -24,8 +24,6 @@ public:
{
return "get_source_file_property";
}
cmTypeMacro(cmGetSourceFilePropertyCommand, cmCommand);
};
#endif

2
Source/cmGetTargetPropertyCommand.h
View File

@ -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

2
Source/cmGetTestPropertyCommand.h
View File

@ -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

2
Source/cmIfCommand.h
View File

@ -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

2
Source/cmIncludeCommand.h
View File

@ -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

2
Source/cmIncludeDirectoryCommand.h
View File

@ -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);

2
Source/cmIncludeExternalMSProjectCommand.h
View File

@ -37,8 +37,6 @@ public:
{
return "include_external_msproject";
}
cmTypeMacro(cmIncludeExternalMSProjectCommand, cmCommand);
};
#endif

2
Source/cmIncludeRegularExpressionCommand.h
View File

@ -36,8 +36,6 @@ public:
{
return "include_regular_expression";
}
cmTypeMacro(cmIncludeRegularExpressionCommand, cmCommand);
};
#endif

2
Source/cmInstallCommand.h
View File

@ -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);

2
Source/cmInstallFilesCommand.h
View File

@ -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;

2
Source/cmInstallProgramsCommand.h
View File

@ -41,8 +41,6 @@ public:
bool HasFinalPass() const CM_OVERRIDE { return true; }
cmTypeMacro(cmInstallProgramsCommand, cmCommand);
protected:
std::string FindInstallSource(const char* name) const;

2
Source/cmInstallTargetsCommand.h
View File

@ -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

2
Source/cmLinkDirectoriesCommand.h
View File

@ -33,8 +33,6 @@ public:
*/
std::string GetName() const CM_OVERRIDE { return "link_directories"; }
cmTypeMacro(cmLinkDirectoriesCommand, cmCommand);
private:
void AddLinkDir(std::string const& dir);
};

2
Source/cmLinkLibrariesCommand.h
View File

@ -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

2
Source/cmListCommand.h
View File

@ -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);

2
Source/cmLoadCacheCommand.h
View File

@ -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;

2
Source/cmLoadCommandCommand.cxx
View File

@ -93,8 +93,6 @@ public:
}
}
cmTypeMacro(cmLoadedCommand, cmCommand);
cmLoadedCommandInfo info;
};

1
Source/cmLoadCommandCommand.h
View File

@ -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

9
Source/cmMacroCommand.cxx
View File

@ -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;

2
Source/cmMacroCommand.h
View File

@ -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

2
Source/cmMakeDirectoryCommand.h
View File

@ -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

2
Source/cmMarkAsAdvancedCommand.h
View File

@ -37,8 +37,6 @@ public:
* FindUnixMake.cmake used by the CTEST_BUILD command.
*/
bool IsScriptable() const CM_OVERRIDE { return true; }
cmTypeMacro(cmMarkAsAdvancedCommand, cmCommand);
};
#endif

2
Source/cmMathCommand.h
View File

@ -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);
};

2
Source/cmMessageCommand.h
View File

@ -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

2
Source/cmOptionCommand.h
View File

@ -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

1
Source/cmOutputRequiredFilesCommand.h
View File

@ -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;

2
Source/cmParseArgumentsCommand.h
View File

@ -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

2
Source/cmProjectCommand.h
View File

@ -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

2
Source/cmQTWrapCPPCommand.h
View File

@ -16,8 +16,6 @@
class cmQTWrapCPPCommand : public cmCommand
{
public:
cmTypeMacro(cmQTWrapCPPCommand, cmCommand);
/**
* This is a virtual constructor for the command.
*/

1
Source/cmQTWrapUICommand.h
View File

@ -15,7 +15,6 @@
class cmQTWrapUICommand : public cmCommand
{
public:
cmTypeMacro(cmQTWrapUICommand, cmCommand);
/**
* This is a virtual constructor for the command.
*/

2
Source/cmRemoveCommand.h
View File

@ -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

2
Source/cmRemoveDefinitionsCommand.h
View File

@ -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

2
Source/cmReturnCommand.h
View File

@ -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

Some files were not shown because too many files have changed in this diff Show More