From 2b785875fbc9815b1fc528a90cf008a2b13f0084 Mon Sep 17 00:00:00 2001 From: Regina Pfeifer Date: Tue, 6 Aug 2019 12:25:12 +0200 Subject: cmFileCommand: turn into free function --- Source/cmCommands.cxx | 2 +- Source/cmFileCommand.cxx | 4 ++-- Source/cmFileCommand.h | 28 ++-------------------------- 3 files changed, 5 insertions(+), 29 deletions(-) diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx index f351ff8..a9be445 100644 --- a/Source/cmCommands.cxx +++ b/Source/cmCommands.cxx @@ -128,7 +128,7 @@ void GetScriptingCommands(cmState* state) cm::make_unique()); state->AddBuiltinCommand("execute_process", cm::make_unique()); - state->AddBuiltinCommand("file", cm::make_unique()); + state->AddBuiltinCommand("file", cmFileCommand); state->AddBuiltinCommand("find_file", cm::make_unique()); state->AddBuiltinCommand("find_library", cm::make_unique()); diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 652e3c5..3292dc0 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -2770,8 +2770,8 @@ bool HandleGetRuntimeDependenciesCommand(std::vector const& args, } // namespace -bool cmFileCommand::InitialPass(std::vector const& args, - cmExecutionStatus& status) +bool cmFileCommand(std::vector const& args, + cmExecutionStatus& status) { if (args.size() < 2) { status.SetError("must be called with at least two arguments."); diff --git a/Source/cmFileCommand.h b/Source/cmFileCommand.h index b564540..8c9b219 100644 --- a/Source/cmFileCommand.h +++ b/Source/cmFileCommand.h @@ -8,33 +8,9 @@ #include #include -#include "cm_memory.hxx" - -#include "cmCommand.h" - class cmExecutionStatus; -/** \class cmFileCommand - * \brief Command for manipulation of files - * - */ -class cmFileCommand : public cmCommand -{ -public: - /** - * This is a virtual constructor for the command. - */ - std::unique_ptr Clone() override - { - return cm::make_unique(); - } - - /** - * This is called when the command is first encountered in - * the CMakeLists.txt file. - */ - bool InitialPass(std::vector const& args, - cmExecutionStatus& status) override; -}; +bool cmFileCommand(std::vector const& args, + cmExecutionStatus& status); #endif -- cgit v0.12