diff options
| author | Michael Stürmer <michael.stuermer@schaeffler.com> | 2018-04-04 08:03:29 +0200 |
|---|---|---|
| committer | Michael Stürmer <michael.stuermer@schaeffler.com> | 2018-04-05 06:36:49 +0200 |
| commit | fb433ff283e57fc953975e7a7cfb9f24dcbf789b (patch) | |
| tree | 84d2a68af7946a000c1bba0cc60078474ba57a7f /Source/cmNinjaNormalTargetGenerator.cxx | |
| parent | 4c1f33961f784c47bcd93f4a5875c1c8f60873b7 (diff) | |
| download | cmake-fb433ff283e57fc953975e7a7cfb9f24dcbf789b.tar.gz | |
cmGeneratorTarget: Make import library checks config-aware
Diffstat (limited to 'Source/cmNinjaNormalTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 52e3677cbf..542bb0a9cd 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -482,7 +482,7 @@ std::vector<std::string> cmNinjaNormalTargetGenerator::ComputeLinkCmd() const char* linkCmd = mf->GetDefinition(linkCmdVar); if (linkCmd) { std::string linkCmdStr = linkCmd; - if (this->GetGeneratorTarget()->HasImplibGNUtoMS()) { + if (this->GetGeneratorTarget()->HasImplibGNUtoMS(this->ConfigName)) { std::string ruleVar = "CMAKE_"; ruleVar += this->GeneratorTarget->GetLinkerLanguage(this->ConfigName); ruleVar += "_GNUtoMS_RULE"; @@ -881,7 +881,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() targetOutputImplib, cmOutputConverter::SHELL); vars["TARGET_IMPLIB"] = impLibPath; EnsureParentDirectoryExists(impLibPath); - if (genTarget.HasImportLibrary()) { + if (genTarget.HasImportLibrary(cfgName)) { byproducts.push_back(targetOutputImplib); } } |