summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRegina Pfeifer <regina@mailbox.org>2019-08-06 10:25:12 (GMT)
committerRegina Pfeifer <regina@mailbox.org>2019-08-06 10:25:12 (GMT)
commit2b785875fbc9815b1fc528a90cf008a2b13f0084 (patch)
tree8b709ff6484f57740f996888614ea9ea89e69a6a
parent9703c65718689e56bfa100f1965b6a83af87e090 (diff)
downloadCMake-2b785875fbc9815b1fc528a90cf008a2b13f0084.zip
CMake-2b785875fbc9815b1fc528a90cf008a2b13f0084.tar.gz
CMake-2b785875fbc9815b1fc528a90cf008a2b13f0084.tar.bz2
cmFileCommand: turn into free function
-rw-r--r--Source/cmCommands.cxx2
-rw-r--r--Source/cmFileCommand.cxx4
-rw-r--r--Source/cmFileCommand.h28
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<cmExecProgramCommand>());
state->AddBuiltinCommand("execute_process",
cm::make_unique<cmExecuteProcessCommand>());
- state->AddBuiltinCommand("file", cm::make_unique<cmFileCommand>());
+ state->AddBuiltinCommand("file", cmFileCommand);
state->AddBuiltinCommand("find_file", cm::make_unique<cmFindFileCommand>());
state->AddBuiltinCommand("find_library",
cm::make_unique<cmFindLibraryCommand>());
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<std::string> const& args,
} // namespace
-bool cmFileCommand::InitialPass(std::vector<std::string> const& args,
- cmExecutionStatus& status)
+bool cmFileCommand(std::vector<std::string> 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 <string>
#include <vector>
-#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<cmCommand> Clone() override
- {
- return cm::make_unique<cmFileCommand>();
- }
-
- /**
- * This is called when the command is first encountered in
- * the CMakeLists.txt file.
- */
- bool InitialPass(std::vector<std::string> const& args,
- cmExecutionStatus& status) override;
-};
+bool cmFileCommand(std::vector<std::string> const& args,
+ cmExecutionStatus& status);
#endif