diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-14 18:14:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-01-16 18:24:27 (GMT) |
| commit | f0e67da0615bd746626cab8e4dff2ba60c7aa2fe (patch) | |
| tree | c27fb29e6b769cc5d501c42758ffd4c0892cec9a /Source/cmExportFileGenerator.cxx | |
| parent | acee6291039537a176fef70820648fc3d8cb4fb0 (diff) | |
| download | CMake-f0e67da0615bd746626cab8e4dff2ba60c7aa2fe.zip CMake-f0e67da0615bd746626cab8e4dff2ba60c7aa2fe.tar.gz CMake-f0e67da0615bd746626cab8e4dff2ba60c7aa2fe.tar.bz2 | |
target_link_libraries: Fix out-of-dir linking of a list of targets
In a case like
target_link_libraries(targetInOtherDir PUBLIC "$<1:a;b>")
then all entries in the list need to be looked up in the caller's
scope. Previously our `::@(directory-id)` suffix would apply only
to the last entry. Instead surround the entire entry by a pair
`::@(directory-id);...;::@` so that the `::@` syntax can encode
a directory lookup scope change evaluated as the list is processed.
Fixes: #20204
Diffstat (limited to 'Source/cmExportFileGenerator.cxx')
| -rw-r--r-- | Source/cmExportFileGenerator.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index 7a4b887..27e9906 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -14,6 +14,7 @@ #include "cmComputeLinkInformation.h" #include "cmGeneratedFileStream.h" #include "cmGeneratorTarget.h" +#include "cmGlobalGenerator.h" #include "cmLinkItem.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" @@ -640,6 +641,9 @@ void cmExportFileGenerator::ResolveTargetsInGeneratorExpressions( std::string sep; input.clear(); for (std::string& li : parts) { + if (cmHasLiteralPrefix(li, CMAKE_DIRECTORY_ID_SEP)) { + continue; + } if (cmGeneratorExpression::Find(li) == std::string::npos) { this->AddTargetNamespace(li, target, missingTargets); } else { |