diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-10-29 21:21:20 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-10-31 13:52:11 (GMT) |
| commit | c4373b33b2ad7c6db3b000b0615ed381f05ac5f3 (patch) | |
| tree | 544c5d58dd31df7f06e85f6d060b87146bfbf5a5 /Source/cmTargetLinkLibrariesCommand.cxx | |
| parent | cfb666133378d723a046ab7a4463a590deaa7aee (diff) | |
| download | CMake-c4373b33b2ad7c6db3b000b0615ed381f05ac5f3.zip CMake-c4373b33b2ad7c6db3b000b0615ed381f05ac5f3.tar.gz CMake-c4373b33b2ad7c6db3b000b0615ed381f05ac5f3.tar.bz2 | |
cmTarget: Make GetProperty() const.
This has follow-on effects for other methods and classes. Further
work on making the use of const cmTarget pointers common can be
done, particularly with a view to generate-time methods.
Diffstat (limited to 'Source/cmTargetLinkLibrariesCommand.cxx')
| -rw-r--r-- | Source/cmTargetLinkLibrariesCommand.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx index 9add198..6b6fe4c 100644 --- a/Source/cmTargetLinkLibrariesCommand.cxx +++ b/Source/cmTargetLinkLibrariesCommand.cxx @@ -384,8 +384,13 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const char* lib, } } - // Handle normal case first. - if(this->CurrentProcessingState != ProcessingKeywordLinkInterface + if(this->CurrentProcessingState == ProcessingLinkLibraries + && !this->Target->GetProperty("LINK_INTERFACE_LIBRARIES")) + { + this->Makefile + ->AddLinkLibraryForTarget(this->Target->GetName(), lib, llt); + } + else if(this->CurrentProcessingState != ProcessingKeywordLinkInterface && this->CurrentProcessingState != ProcessingPlainLinkInterface) { this->Makefile |