summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-05-21 13:38:24 (GMT)
committerBrad King <brad.king@kitware.com>2014-05-21 13:38:24 (GMT)
commit5d12b87b9d505b8c9d0d4363e33636078c7510e7 (patch)
tree48c4659cb56b304b70058b9ce5926cd2b2682d0e /Source/cmLocalGenerator.cxx
parentc2eeb08b06d422c7b72aa9e6431e6e7584ce8c74 (diff)
downloadCMake-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/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index a6ad714..dac95ff 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -657,10 +657,10 @@ void cmLocalGenerator::AddBuildTargetRule(const std::string& llang,
{
std::string objs;
std::vector<std::string> objVector;
+ std::string config = this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
// Add all the sources outputs to the depends of the target
std::vector<cmSourceFile*> classes;
- target.GetSourceFiles(classes,
- this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
+ target.GetSourceFiles(classes, config);
for(std::vector<cmSourceFile*>::const_iterator i = classes.begin();
i != classes.end(); ++i)
{
@@ -686,9 +686,7 @@ void cmLocalGenerator::AddBuildTargetRule(const std::string& llang,
}
}
}
- std::string createRule = "CMAKE_";
- createRule += llang;
- createRule += target.GetCreateRuleVariable();
+ std::string createRule = target.GetCreateRuleVariable(llang, config);
bool useWatcomQuote = this->Makefile->IsOn(createRule+"_USE_WATCOM_QUOTE");
std::string targetName = target.Target->GetFullName();
// Executable :