From 4064d6f216ff6090d2da5797059df13924cc3589 Mon Sep 17 00:00:00 2001 From: Brad King Date: Sat, 2 Nov 2013 07:07:53 -0400 Subject: [PATCH] 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. --- Source/cmTargetLinkLibrariesCommand.cxx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx index 6b6fe4c03..9add1980e 100644 --- a/Source/cmTargetLinkLibrariesCommand.cxx +++ b/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->Makefile