mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-22 15:10:20 -06:00
@@ -237,8 +237,7 @@ void GetProjectCommands(cmState* state)
|
||||
cmIncludeRegularExpressionCommand);
|
||||
state->AddBuiltinCommand("install", cm::make_unique<cmInstallCommand>());
|
||||
state->AddBuiltinCommand("install_files", cmInstallFilesCommand);
|
||||
state->AddBuiltinCommand("install_targets",
|
||||
cm::make_unique<cmInstallTargetsCommand>());
|
||||
state->AddBuiltinCommand("install_targets", cmInstallTargetsCommand);
|
||||
state->AddBuiltinCommand("link_directories",
|
||||
cm::make_unique<cmLinkDirectoriesCommand>());
|
||||
state->AddBuiltinCommand("project", cm::make_unique<cmProjectCommand>());
|
||||
|
||||
@@ -5,25 +5,25 @@
|
||||
#include <unordered_map>
|
||||
#include <utility>
|
||||
|
||||
#include "cmExecutionStatus.h"
|
||||
#include "cmGlobalGenerator.h"
|
||||
#include "cmMakefile.h"
|
||||
#include "cmTarget.h"
|
||||
|
||||
class cmExecutionStatus;
|
||||
|
||||
// cmExecutableCommand
|
||||
bool cmInstallTargetsCommand::InitialPass(std::vector<std::string> const& args,
|
||||
cmExecutionStatus&)
|
||||
bool cmInstallTargetsCommand(std::vector<std::string> const& args,
|
||||
cmExecutionStatus& status)
|
||||
{
|
||||
if (args.size() < 2) {
|
||||
this->SetError("called with incorrect number of arguments");
|
||||
status.SetError("called with incorrect number of arguments");
|
||||
return false;
|
||||
}
|
||||
|
||||
// Enable the install target.
|
||||
this->Makefile->GetGlobalGenerator()->EnableInstallTarget();
|
||||
cmMakefile& mf = status.GetMakefile();
|
||||
|
||||
cmMakefile::cmTargetMap& tgts = this->Makefile->GetTargets();
|
||||
// Enable the install target.
|
||||
mf.GetGlobalGenerator()->EnableInstallTarget();
|
||||
|
||||
cmMakefile::cmTargetMap& tgts = mf.GetTargets();
|
||||
auto s = args.begin();
|
||||
++s;
|
||||
std::string runtime_dir = "/bin";
|
||||
@@ -31,8 +31,8 @@ bool cmInstallTargetsCommand::InitialPass(std::vector<std::string> const& args,
|
||||
if (*s == "RUNTIME_DIRECTORY") {
|
||||
++s;
|
||||
if (s == args.end()) {
|
||||
this->SetError("called with RUNTIME_DIRECTORY but no actual "
|
||||
"directory");
|
||||
status.SetError("called with RUNTIME_DIRECTORY but no actual "
|
||||
"directory");
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -45,14 +45,14 @@ bool cmInstallTargetsCommand::InitialPass(std::vector<std::string> const& args,
|
||||
ti->second.SetHaveInstallRule(true);
|
||||
} else {
|
||||
std::string str = "Cannot find target: \"" + *s + "\" to install.";
|
||||
this->SetError(str);
|
||||
status.SetError(str);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this->Makefile->GetGlobalGenerator()->AddInstallComponent(
|
||||
this->Makefile->GetSafeDefinition("CMAKE_INSTALL_DEFAULT_COMPONENT_NAME"));
|
||||
mf.GetGlobalGenerator()->AddInstallComponent(
|
||||
mf.GetSafeDefinition("CMAKE_INSTALL_DEFAULT_COMPONENT_NAME"));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -8,36 +8,9 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "cm_memory.hxx"
|
||||
|
||||
#include "cmCommand.h"
|
||||
|
||||
class cmExecutionStatus;
|
||||
|
||||
/** \class cmInstallTargetsCommand
|
||||
* \brief Specifies where to install some targets
|
||||
*
|
||||
* cmInstallTargetsCommand specifies the relative path where a list of
|
||||
* targets should be installed. The targets can be executables or
|
||||
* libraries.
|
||||
*/
|
||||
class cmInstallTargetsCommand : public cmCommand
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* This is a virtual constructor for the command.
|
||||
*/
|
||||
std::unique_ptr<cmCommand> Clone() override
|
||||
{
|
||||
return cm::make_unique<cmInstallTargetsCommand>();
|
||||
}
|
||||
|
||||
/**
|
||||
* 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 cmInstallTargetsCommand(std::vector<std::string> const& args,
|
||||
cmExecutionStatus& status);
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user