From 3ef8aaaa71786b32ed88a29e48dd17d32f5a8a79 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 28 Jul 2015 22:00:27 +0200 Subject: cmInstallCommand: Move the SetHaveInstallRule invocation. Remove the call from cmInstallTargetGenerator because that is to be ported away from cmTarget. --- Source/cmInstallCommand.cxx | 6 ++++++ Source/cmInstallTargetGenerator.cxx | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) 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 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); } //---------------------------------------------------------------------------- -- cgit v0.12