فهرست منبع

cmInstallCommand: Move the SetHaveInstallRule invocation.

Remove the call from cmInstallTargetGenerator because that is
to be ported away from cmTarget.
Stephen Kelly 10 سال پیش
والد
کامیت
3ef8aaaa71
2فایلهای تغییر یافته به همراه6 افزوده شده و 1 حذف شده
  1. 6 0
      Source/cmInstallCommand.cxx
  2. 0 1
      Source/cmInstallTargetGenerator.cxx

+ 6 - 0
Source/cmInstallCommand.cxx

@@ -752,6 +752,12 @@ 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);

+ 0 - 1
Source/cmInstallTargetGenerator.cxx

@@ -35,7 +35,6 @@ cmInstallTargetGenerator
 {
   this->ActionsPerConfig = true;
   this->NamelinkMode = NamelinkModeNone;
-  this->Target->SetHaveInstallRule(true);
 }
 
 //----------------------------------------------------------------------------