diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-21 13:38:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-05-21 13:38:24 (GMT) |
| commit | 5d12b87b9d505b8c9d0d4363e33636078c7510e7 (patch) | |
| tree | 48c4659cb56b304b70058b9ce5926cd2b2682d0e /Source/cmNinjaNormalTargetGenerator.cxx | |
| parent | c2eeb08b06d422c7b72aa9e6431e6e7584ce8c74 (diff) | |
| download | CMake-5d12b87b9d505b8c9d0d4363e33636078c7510e7.zip CMake-5d12b87b9d505b8c9d0d4363e33636078c7510e7.tar.gz CMake-5d12b87b9d505b8c9d0d4363e33636078c7510e7.tar.bz2 | |
cmGeneratorTarget: Improve GetCreateRuleVariable API
Pass the language and configuration to the method so it can return the
complete rule variable name.
Diffstat (limited to 'Source/cmNinjaNormalTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index b467d22..cfcf9f4 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -314,9 +314,8 @@ cmNinjaNormalTargetGenerator std::vector<std::string> linkCmds; cmMakefile* mf = this->GetMakefile(); { - std::string linkCmdVar = "CMAKE_"; - linkCmdVar += this->TargetLinkLanguage; - linkCmdVar += this->GetGeneratorTarget()->GetCreateRuleVariable(); + std::string linkCmdVar = this->GetGeneratorTarget() + ->GetCreateRuleVariable(this->TargetLinkLanguage, this->GetConfigName()); const char *linkCmd = mf->GetDefinition(linkCmdVar); if (linkCmd) { @@ -451,8 +450,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() std::string linkPath; cmGeneratorTarget& genTarget = *this->GetGeneratorTarget(); - std::string createRule = "CMAKE_"; - createRule += this->TargetLinkLanguage + genTarget.GetCreateRuleVariable(); + std::string createRule = + genTarget.GetCreateRuleVariable(this->TargetLinkLanguage, + this->GetConfigName()); bool useWatcomQuote = mf->IsOn(createRule+"_USE_WATCOM_QUOTE"); cmLocalNinjaGenerator& localGen = *this->GetLocalGenerator(); localGen.GetTargetFlags(vars["LINK_LIBRARIES"], |