reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-23 13:32:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'gg-stdstring'

Browse Source 
4e94f6447a cmGlobalGenerator::AddInstallComponent(): Accept std::string argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2332
This commit is contained in:
Brad King 2018-08-31 18:49:24 +00:00 committed by Kitware Robot
commit 28979843d1
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGlobalGenerator.cxx
View File

@ -1997,9 +1997,9 @@ void cmGlobalGenerator::AddMakefile(cmMakefile* mf)
this->CMakeInstance->UpdateProgress("Configuring", prog);
}
void cmGlobalGenerator::AddInstallComponent(const char* component)
void cmGlobalGenerator::AddInstallComponent(const std::string& component)
{
if (component && *component) {
if (!component.empty()) {
this->InstallComponents.insert(component);
}
}

2
Source/cmGlobalGenerator.h
View File

@ -219,7 +219,7 @@ public:
std::string GetExtraGeneratorName() const;
void AddInstallComponent(const char* component);
void AddInstallComponent(const std::string& component);
const std::set<std::string>* GetInstallComponents() const
{

26
Source/cmInstallCommand.cxx
View File

@ -187,7 +187,7 @@ bool cmInstallCommand::HandleScriptMode(std::vector<std::string> const& args)
// Tell the global generator about any installation component names
// specified.
this->Makefile->GetGlobalGenerator()->AddInstallComponent(component.c_str());
this->Makefile->GetGlobalGenerator()->AddInstallComponent(component);
return true;
}
@ -761,43 +761,43 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
// specified
if (installsArchive) {
this->Makefile->GetGlobalGenerator()->AddInstallComponent(
archiveArgs.GetComponent().c_str());
archiveArgs.GetComponent());
}
if (installsLibrary) {
this->Makefile->GetGlobalGenerator()->AddInstallComponent(
libraryArgs.GetComponent().c_str());
libraryArgs.GetComponent());
}
if (installsNamelink) {
this->Makefile->GetGlobalGenerator()->AddInstallComponent(
libraryArgs.GetNamelinkComponent().c_str());
libraryArgs.GetNamelinkComponent());
}
if (installsRuntime) {
this->Makefile->GetGlobalGenerator()->AddInstallComponent(
runtimeArgs.GetComponent().c_str());
runtimeArgs.GetComponent());
}
if (installsObject) {
this->Makefile->GetGlobalGenerator()->AddInstallComponent(
objectArgs.GetComponent().c_str());
objectArgs.GetComponent());
}
if (installsFramework) {
this->Makefile->GetGlobalGenerator()->AddInstallComponent(
frameworkArgs.GetComponent().c_str());
frameworkArgs.GetComponent());
}
if (installsBundle) {
this->Makefile->GetGlobalGenerator()->AddInstallComponent(
bundleArgs.GetComponent().c_str());
bundleArgs.GetComponent());
}
if (installsPrivateHeader) {
this->Makefile->GetGlobalGenerator()->AddInstallComponent(
privateHeaderArgs.GetComponent().c_str());
privateHeaderArgs.GetComponent());
}
if (installsPublicHeader) {
this->Makefile->GetGlobalGenerator()->AddInstallComponent(
publicHeaderArgs.GetComponent().c_str());
publicHeaderArgs.GetComponent());
}
if (installsResource) {
this->Makefile->GetGlobalGenerator()->AddInstallComponent(
resourceArgs.GetComponent().c_str());
resourceArgs.GetComponent());
}
return true;
@ -899,7 +899,7 @@ bool cmInstallCommand::HandleFilesMode(std::vector<std::string> const& args)
// Tell the global generator about any installation component names
// specified.
this->Makefile->GetGlobalGenerator()->AddInstallComponent(
ica.GetComponent().c_str());
ica.GetComponent());
return true;
}
@ -1196,7 +1196,7 @@ bool cmInstallCommand::HandleDirectoryMode(
// Tell the global generator about any installation component names
// specified.
this->Makefile->GetGlobalGenerator()->AddInstallComponent(component.c_str());
this->Makefile->GetGlobalGenerator()->AddInstallComponent(component);
return true;
}