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

cmLocalGenerator: Use the language from the compiler container

Browse Source 
This is just to make follow-up diffs smaller.
This commit is contained in:
Stephen Kelly 2016-10-09 10:34:48 +02:00
parent 88016e2e9f
commit 8b0e479568
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmLocalGenerator.cxx
View File

@ -726,17 +726,18 @@ std::string cmLocalGenerator::ExpandRuleVariable(
std::string arg1 = compIt->first + "_ARG1"; std::string arg1 = compIt->first + "_ARG1";
compilerArg1 = this->Makefile->GetDefinition(arg1); compilerArg1 = this->Makefile->GetDefinition(arg1);
compilerTarget = this->Makefile->GetDefinition( compilerTarget = this->Makefile->GetDefinition(
std::string("CMAKE_") + lang + "_COMPILER_TARGET"); std::string("CMAKE_") + compIt->second + "_COMPILER_TARGET");
compilerOptionTarget = this->Makefile->GetDefinition( compilerOptionTarget = this->Makefile->GetDefinition(
std::string("CMAKE_") + lang + "_COMPILE_OPTIONS_TARGET"); std::string("CMAKE_") + compIt->second + "_COMPILE_OPTIONS_TARGET");
compilerExternalToolchain = this->Makefile->GetDefinition( compilerExternalToolchain = this->Makefile->GetDefinition(
std::string("CMAKE_") + lang + "_COMPILER_EXTERNAL_TOOLCHAIN"); std::string("CMAKE_") + compIt->second +
compilerOptionExternalToolchain = "_COMPILER_EXTERNAL_TOOLCHAIN");
this->Makefile->GetDefinition(std::string("CMAKE_") + lang + compilerOptionExternalToolchain = this->Makefile->GetDefinition(
"_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN"); std::string("CMAKE_") + compIt->second +
"_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN");
compilerSysroot = this->Makefile->GetDefinition("CMAKE_SYSROOT"); compilerSysroot = this->Makefile->GetDefinition("CMAKE_SYSROOT");
compilerOptionSysroot = this->Makefile->GetDefinition( compilerOptionSysroot = this->Makefile->GetDefinition(
std::string("CMAKE_") + lang + "_COMPILE_OPTIONS_SYSROOT"); std::string("CMAKE_") + compIt->second + "_COMPILE_OPTIONS_SYSROOT");
} }
if (actualReplace.find("${LANG}") != actualReplace.npos) { if (actualReplace.find("${LANG}") != actualReplace.npos) {
cmSystemTools::ReplaceString(actualReplace, "${LANG}", lang); cmSystemTools::ReplaceString(actualReplace, "${LANG}", lang);