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