parent
5ceafcb7e2
commit
a4fb93599f
|
@ -646,7 +646,7 @@ bool cmInstallCommand::HandleFilesMode(std::vector<std::string> const& args)
|
||||||
this->Makefile->AddInstallGenerator(
|
this->Makefile->AddInstallGenerator(
|
||||||
CreateInstallFilesGenerator(absFiles, ica, programs));
|
CreateInstallFilesGenerator(absFiles, ica, programs));
|
||||||
|
|
||||||
// Tell the global generator about any installation component names specified.
|
//Tell the global generator about any installation component names specified.
|
||||||
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
|
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
|
||||||
->AddInstallComponent(ica.GetComponent().c_str());
|
->AddInstallComponent(ica.GetComponent().c_str());
|
||||||
|
|
||||||
|
|
|
@ -40,9 +40,9 @@ class cmInstallCommandArguments
|
||||||
const std::vector<std::string>& GetConfigurations() const;
|
const std::vector<std::string>& GetConfigurations() const;
|
||||||
bool GetOptional() const;
|
bool GetOptional() const;
|
||||||
|
|
||||||
// once HandleDirectoryMode() is also switched to using cmInstallCommandArguments
|
// once HandleDirectoryMode() is also switched to using
|
||||||
// then these two functions can become non-static private member functions
|
// cmInstallCommandArguments then these two functions can become non-static
|
||||||
// without arguments
|
// private member functions without arguments
|
||||||
static void ComputeDestination(const std::string& inDest,
|
static void ComputeDestination(const std::string& inDest,
|
||||||
std::string& absDest);
|
std::string& absDest);
|
||||||
static bool CheckPermissions(const std::string& onePerm,
|
static bool CheckPermissions(const std::string& onePerm,
|
||||||
|
|
Loading…
Reference in New Issue