Merge branch 'fix-install-rules' into release

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);