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

Refactoring: Use ConfigName instead of property CMAKE_BUILD_TYPE

Browse Source 
Use memorized `this->ConfigName` instead of retrieving the value of property
CMAKE_BUILD_TYPE.
This commit is contained in:
Daniel Eiband
2019-09-11 17:56:42 +02:00
parent e6ddb57479
commit 026ef9b312
3 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@@ -161,8 +161,7 @@ void cmLocalUnixMakefileGenerator3::GetLocalObjectFiles(
continue;
}
std::vector<cmSourceFile const*> objectSources;
gt->GetObjectSources(
objectSources, this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
gt->GetObjectSources(objectSources, this->ConfigName);
// Compute full path to object file directory for this target.
std::string dir = cmStrCat(gt->LocalGenerator->GetCurrentBinaryDirectory(),
'/', this->GetTargetDirectory(gt), '/');
@@ -1864,9 +1863,8 @@ void cmLocalUnixMakefileGenerator3::WriteDependLanguageInfo(
<< "_TARGET_INCLUDE_PATH\n";
std::vector<std::string> includes;
const std::string& config =
this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
this->GetIncludeDirectories(includes, target, implicitLang.first, config);
this->GetIncludeDirectories(includes, target, implicitLang.first,
this->ConfigName);
std::string binaryDir = this->GetState()->GetBinaryDirectory();
if (this->Makefile->IsOn("CMAKE_DEPENDS_IN_PROJECT_ONLY")) {
std::string const& sourceDir = this->GetState()->GetSourceDirectory();