diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-02 11:07:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-11-02 11:11:51 (GMT) |
| commit | 4064d6f216ff6090d2da5797059df13924cc3589 (patch) | |
| tree | 91151827b7b2f1eec3dd9a0daf947d2f93eba21c /Source/cmTargetLinkLibrariesCommand.cxx | |
| parent | c4373b33b2ad7c6db3b000b0615ed381f05ac5f3 (diff) | |
| download | CMake-4064d6f216ff6090d2da5797059df13924cc3589.zip CMake-4064d6f216ff6090d2da5797059df13924cc3589.tar.gz CMake-4064d6f216ff6090d2da5797059df13924cc3589.tar.bz2 | |
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.
Diffstat (limited to 'Source/cmTargetLinkLibrariesCommand.cxx')
| -rw-r--r-- | Source/cmTargetLinkLibrariesCommand.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx index 6b6fe4c..9add198 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 |