diff options
author | Brad King <brad.king@kitware.com> | 2018-09-11 12:20:44 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-11 12:20:50 (GMT) |
commit | b1c8d95dbe97ab2511e08518bf8eee1f5da2e941 (patch) | |
tree | 92bca74c16341c4b47b13b0c46ae148889a69ea4 /Source/cmVisualStudio10TargetGenerator.cxx | |
parent | 4188b8fd6a17b7959aff8cf695ad02c291171950 (diff) | |
parent | f35be599612b788125d08a7c3e61d0fad3805bdd (diff) | |
download | CMake-b1c8d95dbe97ab2511e08518bf8eee1f5da2e941.zip CMake-b1c8d95dbe97ab2511e08518bf8eee1f5da2e941.tar.gz CMake-b1c8d95dbe97ab2511e08518bf8eee1f5da2e941.tar.bz2 |
Merge topic 'imported-same-name'
f35be59961 Fix transitive usage requirements through same-name imported targets
1b57f49586 genex: Simplify cmGeneratorExpressionInterpreter
bea390e9bd Fix dependency propagation through same-name imported targets
fc7e4d1ed8 cmLinkItem: Convert to a "sum type" over a string and target pointer
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2359
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 9e74335..53a2a59 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2117,8 +2117,7 @@ void cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags( flagtable = gg->GetCSharpFlagTable(); } cmGeneratorExpressionInterpreter genexInterpreter( - this->LocalGenerator, this->GeneratorTarget, config, - this->GeneratorTarget->GetName(), lang); + this->LocalGenerator, config, this->GeneratorTarget, lang); cmVS10GeneratorOptions clOptions( this->LocalGenerator, cmVisualStudioGeneratorOptions::Compiler, flagtable, this); |