summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-11-08 12:41:33 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-11-08 12:56:11 (GMT)
commit9103d8ace327d34a6bc5085e0ec91abc6e8053f1 (patch)
tree52e775752ba0d8d19ee337960bd4040e55afdd1b /Source
parentbc4b6aa68dd48ffd567ae7a24abd8911a689c38a (diff)
downloadCMake-9103d8ace327d34a6bc5085e0ec91abc6e8053f1.zip
CMake-9103d8ace327d34a6bc5085e0ec91abc6e8053f1.tar.gz
CMake-9103d8ace327d34a6bc5085e0ec91abc6e8053f1.tar.bz2
Install: Move SetHaveInstallRule to a more-obvious place
The moved-from location checks for the existence of whether certain generators are needed for any target in a loop, rather than whether the current target has an install rule. This was introduced in commit v3.4.0-rc1~275^2~3 (cmInstallCommand: Move the SetHaveInstallRule invocation., 2015-07-28). Move the SetHaveInstallRule call to a more-obvious place where the cmInstallTargetGenerator is constructed.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmInstallCommand.cxx7
1 files changed, 1 insertions, 6 deletions
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index 333c2ff..d3c2e26 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -27,6 +27,7 @@ static cmInstallTargetGenerator* CreateInstallTargetGenerator(cmTarget& target,
{
cmInstallGenerator::MessageLevel message =
cmInstallGenerator::SelectMessageLevel(target.GetMakefile());
+ target.SetHaveInstallRule(true);
return new cmInstallTargetGenerator(target.GetName(),
args.GetDestination().c_str(),
impLib, args.GetPermissions().c_str(),
@@ -753,12 +754,6 @@ 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);