mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 14:20:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmLocalGenerator: Avoid using upper-case config when not necessary

Browse Source 
Calls to `GetLinkerLanguage`, `GetSourceFiles`, etc. can accept
the original-case config name.
This commit is contained in:
Brad King
2020-03-30 10:54:44 -04:00
parent a4b76c237d
commit ff02a592bc
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmLocalGenerator.cxx
View File

@@ -1357,7 +1357,7 @@ void cmLocalGenerator::GetTargetFlags(
"CMAKE_SHARED_LINKER_FLAGS"; // default to shared library
const std::string linkLanguage =
linkLineComputer->GetLinkerLanguage(target, configUpper);
linkLineComputer->GetLinkerLanguage(target, config);
switch (target->GetType()) {
case cmStateEnums::STATIC_LIBRARY:
@@ -1386,7 +1386,7 @@ void cmLocalGenerator::GetTargetFlags(
!(this->Makefile->IsOn("CYGWIN") ||
this->Makefile->IsOn("MINGW"))) {
std::vector<cmSourceFile*> sources;
target->GetSourceFiles(sources, configUpper);
target->GetSourceFiles(sources, config);
std::string defFlag =
this->Makefile->GetSafeDefinition("CMAKE_LINK_DEF_FILE_FLAG");
for (cmSourceFile* sf : sources) {
@@ -1461,8 +1461,7 @@ void cmLocalGenerator::GetTargetFlags(
}
}
this->AddLanguageFlagsForLinking(flags, target, linkLanguage,
configUpper);
this->AddLanguageFlagsForLinking(flags, target, linkLanguage, config);
if (pcli) {
this->OutputLinkLibraries(pcli, linkLineComputer, linkLibs,
frameworkPath, linkPath);