reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-15 07:41:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmLocalGenerator: Introduce a container of compiler names

Browse Source 
Use it to determine when a rule replacement should gain extra options.
This commit is contained in:
Stephen Kelly 2016-10-09 10:34:48 +02:00
parent be87cb0c44
commit 88016e2e9f
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmLocalGenerator.cxx
View File

@ -691,6 +691,17 @@ std::string cmLocalGenerator::ExpandRuleVariable(
}
std::vector<std::string> enabledLanguages =
this->GetState()->GetEnabledLanguages();
std::map<std::string, std::string> compilers;
for (std::vector<std::string>::iterator i = enabledLanguages.begin();
i != enabledLanguages.end(); ++i) {
std::string const& lang = *i;
if (lang == "NONE") {
continue;
}
compilers["CMAKE_" + lang + "_COMPILER"] = lang;
}
// loop over language specific replace variables
for (const char* const* replaceIter = cmArrayBegin(ruleReplaceVars);
replaceIter != cmArrayEnd(ruleReplaceVars); ++replaceIter) {
@ -707,9 +718,12 @@ std::string cmLocalGenerator::ExpandRuleVariable(
const char* compilerOptionExternalToolchain = CM_NULLPTR;
const char* compilerSysroot = CM_NULLPTR;
const char* compilerOptionSysroot = CM_NULLPTR;
if (actualReplace == "CMAKE_${LANG}_COMPILER") {
std::string arg1 = actualReplace + "_ARG1";
cmSystemTools::ReplaceString(arg1, "${LANG}", lang);
std::map<std::string, std::string>::iterator compIt =
compilers.find(variable);
if (compIt != compilers.end()) {
std::string arg1 = compIt->first + "_ARG1";
compilerArg1 = this->Makefile->GetDefinition(arg1);
compilerTarget = this->Makefile->GetDefinition(
std::string("CMAKE_") + lang + "_COMPILER_TARGET");