diff options
author | Brad King <brad.king@kitware.com> | 2019-12-12 17:05:51 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-12-12 17:05:57 (GMT) |
commit | f6e29e04051326861afc0b4fc98a77e20b366ff0 (patch) | |
tree | 4a5677bb216c5dd61b75dd919aeac9e76cf76c7a /Source | |
parent | 4fb9c880425ade41735951347d4e7d004a4e1e47 (diff) | |
parent | af9d4f24ae3df599048ce69831e2635fb3605f90 (diff) | |
download | CMake-f6e29e04051326861afc0b4fc98a77e20b366ff0.zip CMake-f6e29e04051326861afc0b4fc98a77e20b366ff0.tar.gz CMake-f6e29e04051326861afc0b4fc98a77e20b366ff0.tar.bz2 |
Merge topic 'link-options-propagation'
af9d4f24ae Link properties: must be transitive over private dependency on static library
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4130
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmGeneratorTarget.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index a4a074f..94ce2e1 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -1215,8 +1215,8 @@ std::string cmGeneratorTarget::EvaluateInterfaceProperty( context->EvaluateForBuildsystem, context->Backtrace, context->Language); std::string libResult = cmGeneratorExpression::StripEmptyListElements( - lib.Target->EvaluateInterfaceProperty(prop, &libContext, - &dagChecker)); + lib.Target->EvaluateInterfaceProperty(prop, &libContext, &dagChecker, + usage_requirements_only)); if (!libResult.empty()) { if (result.empty()) { result = std::move(libResult); |