فهرست منبع

target_link_libraries: Revert accidental change

In commit c4373b33 (cmTarget: Make GetProperty() const, 2013-10-29)
we accidentally changed the cmTargetLinkLibrariesCommand.cxx logic
in a way that looks like a local experiment leftover that went
unnoticed due to the size of the other changes in the commit.
Revert it.
Brad King 12 سال پیش
والد
کامیت
4064d6f216
1فایلهای تغییر یافته به همراه2 افزوده شده و 7 حذف شده
  1. 2 7
      Source/cmTargetLinkLibrariesCommand.cxx

+ 2 - 7
Source/cmTargetLinkLibrariesCommand.cxx

@@ -384,13 +384,8 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const char* lib,
         }
         }
     }
     }
 
 
-  if(this->CurrentProcessingState == ProcessingLinkLibraries
-        && !this->Target->GetProperty("LINK_INTERFACE_LIBRARIES"))
-    {
-    this->Makefile
-      ->AddLinkLibraryForTarget(this->Target->GetName(), lib, llt);
-    }
-  else if(this->CurrentProcessingState != ProcessingKeywordLinkInterface
+  // Handle normal case first.
+  if(this->CurrentProcessingState != ProcessingKeywordLinkInterface
       && this->CurrentProcessingState != ProcessingPlainLinkInterface)
       && this->CurrentProcessingState != ProcessingPlainLinkInterface)
     {
     {
     this->Makefile
     this->Makefile