diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-18 14:02:22 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-18 14:02:22 (GMT) |
| commit | b051ccbb52cca7b0542d8e70c3066eac9bdc66d4 (patch) | |
| tree | 7fa18cb6a26270d818848373e4d3d9450d9a1bde /Source/cmTargetLinkLibrariesCommand.cxx | |
| parent | 037887e7abe237569b8207d4aea9e897bddb5561 (diff) | |
| parent | dede273193139793d18e3e3fe800acec27140f06 (diff) | |
| download | CMake-b051ccbb52cca7b0542d8e70c3066eac9bdc66d4.zip CMake-b051ccbb52cca7b0542d8e70c3066eac9bdc66d4.tar.gz CMake-b051ccbb52cca7b0542d8e70c3066eac9bdc66d4.tar.bz2 | |
Merge topic 'allow-repeated-LINK-keywords'
dede273 target_link_libraries: Allow repeated use of LINK_{PRIVATE,PUBLIC} keywords.
Diffstat (limited to 'Source/cmTargetLinkLibrariesCommand.cxx')
| -rw-r--r-- | Source/cmTargetLinkLibrariesCommand.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx index 22f6a03..0707c62 100644 --- a/Source/cmTargetLinkLibrariesCommand.cxx +++ b/Source/cmTargetLinkLibrariesCommand.cxx @@ -151,7 +151,8 @@ bool cmTargetLinkLibrariesCommand else if(args[i] == "LINK_PUBLIC") { if(i != 1 - && this->CurrentProcessingState != ProcessingPlainPrivateInterface) + && this->CurrentProcessingState != ProcessingPlainPrivateInterface + && this->CurrentProcessingState != ProcessingPlainPublicInterface) { this->Makefile->IssueMessage( cmake::FATAL_ERROR, @@ -181,7 +182,8 @@ bool cmTargetLinkLibrariesCommand else if(args[i] == "LINK_PRIVATE") { if(i != 1 - && this->CurrentProcessingState != ProcessingPlainPublicInterface) + && this->CurrentProcessingState != ProcessingPlainPublicInterface + && this->CurrentProcessingState != ProcessingPlainPrivateInterface) { this->Makefile->IssueMessage( cmake::FATAL_ERROR, |