kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmInstallCommand: Move the SetHaveInstallRule invocation.

Browse Source 
Remove the call from cmInstallTargetGenerator because that is
to be ported away from cmTarget.
This commit is contained in:
Stephen Kelly 2015-07-28 22:00:27 +02:00
parent 5f662b3887
commit 3ef8aaaa71
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmInstallCommand.cxx
View File

@ -752,6 +752,12 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
installsPublicHeader = installsPublicHeader || publicHeaderGenerator != 0; installsPublicHeader = installsPublicHeader || publicHeaderGenerator != 0;
installsResource = installsResource || resourceGenerator; installsResource = installsResource || resourceGenerator;
if (installsArchive || installsRuntime || installsFramework
|| installsLibrary || installsBundle)
{
target.SetHaveInstallRule(true);
}
this->Makefile->AddInstallGenerator(archiveGenerator); this->Makefile->AddInstallGenerator(archiveGenerator);
this->Makefile->AddInstallGenerator(libraryGenerator); this->Makefile->AddInstallGenerator(libraryGenerator);
this->Makefile->AddInstallGenerator(runtimeGenerator); this->Makefile->AddInstallGenerator(runtimeGenerator);

1
Source/cmInstallTargetGenerator.cxx
View File

@ -35,7 +35,6 @@ cmInstallTargetGenerator
{ {
this->ActionsPerConfig = true; this->ActionsPerConfig = true;
this->NamelinkMode = NamelinkModeNone; this->NamelinkMode = NamelinkModeNone;
this->Target->SetHaveInstallRule(true);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------