diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-09 14:28:05 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-02-09 14:28:20 (GMT) |
| commit | e40cea3fe99dc79b1ce8bc8330f662ec3a36dc8e (patch) | |
| tree | 444d13efd4e6a4844c57a209c4392102250a0969 /Source/cmGeneratorExpressionDAGChecker.cxx | |
| parent | 3d5466d5e95869380b38e40f8431a19e8a6d458e (diff) | |
| parent | 2a6b0415d71db893b6d8edd1c5058d42eb40fca6 (diff) | |
| download | CMake-e40cea3fe99dc79b1ce8bc8330f662ec3a36dc8e.zip CMake-e40cea3fe99dc79b1ce8bc8330f662ec3a36dc8e.tar.gz CMake-e40cea3fe99dc79b1ce8bc8330f662ec3a36dc8e.tar.bz2 | |
Merge topic 'genex-LINK_LIBRARY-to-decorate-library'
2a6b0415d7 $<LINK_LIBRARY>: Add LINK_LIBRARY_OVERRIDE target property
42965799b4 Genex: Add $<LINK_LIBRARY:...>
78dd7d5292 cmRulePlaceholderExpander: add base class for placeholder expansion reuse
4b55828a9f cmExpandListWithBacktrace: add handling of empty elements.
28d7432468 cmComputeLinkInformation: use cmComputeLinkDepends::LinkEntry
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6769
Diffstat (limited to 'Source/cmGeneratorExpressionDAGChecker.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionDAGChecker.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx index d4b02a5..d35d428 100644 --- a/Source/cmGeneratorExpressionDAGChecker.cxx +++ b/Source/cmGeneratorExpressionDAGChecker.cxx @@ -167,7 +167,7 @@ bool cmGeneratorExpressionDAGChecker::EvaluatingLinkExpression() const cm::string_view property(this->Top()->Property); return property == "LINK_DIRECTORIES"_s || property == "LINK_OPTIONS"_s || - property == "LINK_DEPENDS"_s; + property == "LINK_DEPENDS"_s || property == "LINK_LIBRARY_OVERRIDE"_s; } bool cmGeneratorExpressionDAGChecker::EvaluatingLinkOptionsExpression() const |