diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-07-28 20:00:27 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-07-30 06:28:31 (GMT) |
| commit | 3ef8aaaa71786b32ed88a29e48dd17d32f5a8a79 (patch) | |
| tree | 442eb8767f9d8fa6c0a91253eb06b302c2dc80fa /Source | |
| parent | 5f662b3887c3e92adfcad1bc92eabfd86db263b7 (diff) | |
| download | CMake-3ef8aaaa71786b32ed88a29e48dd17d32f5a8a79.zip CMake-3ef8aaaa71786b32ed88a29e48dd17d32f5a8a79.tar.gz CMake-3ef8aaaa71786b32ed88a29e48dd17d32f5a8a79.tar.bz2 | |
cmInstallCommand: Move the SetHaveInstallRule invocation.
Remove the call from cmInstallTargetGenerator because that is
to be ported away from cmTarget.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmInstallCommand.cxx | 6 | ||||
| -rw-r--r-- | Source/cmInstallTargetGenerator.cxx | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index 899b088..a33acad 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -752,6 +752,12 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args) installsPublicHeader = installsPublicHeader || publicHeaderGenerator != 0; installsResource = installsResource || resourceGenerator; + if (installsArchive || installsRuntime || installsFramework + || installsLibrary || installsBundle) + { + target.SetHaveInstallRule(true); + } + this->Makefile->AddInstallGenerator(archiveGenerator); this->Makefile->AddInstallGenerator(libraryGenerator); this->Makefile->AddInstallGenerator(runtimeGenerator); diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 5115788..09af56e 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -35,7 +35,6 @@ cmInstallTargetGenerator { this->ActionsPerConfig = true; this->NamelinkMode = NamelinkModeNone; - this->Target->SetHaveInstallRule(true); } //---------------------------------------------------------------------------- |