commit bab8f83cac33df3f48da178076fe3668dd222648
author Brad King <brad.king@kitware.com> Mon Nov 09 09:38:16 2015 -0500
committer Brad King <brad.king@kitware.com> Mon Nov 09 09:38:16 2015 -0500
tree 52e775752ba0d8d19ee337960bd4040e55afdd1b
parent bc4b6aa68dd48ffd567ae7a24abd8911a689c38a
parent 9103d8ace327d34a6bc5085e0ec91abc6e8053f1

Merge branch 'fix-install-rules' into release

Source/cmInstallCommand.cxx

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