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

Merge topic 'noduplicates'

Browse Source 
78357e98a4 Avoid duplicate calls to GetDefinition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5073
This commit is contained in:
Brad King
2020-07-29 12:06:58 +00:00
committed by Kitware Robot
parent ef8e8fdf09 78357e98a4
commit f04c68fab3
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGlobalGenerator.cxx
View File

@@ -401,15 +401,13 @@ bool cmGlobalGenerator::FindMakeProgram(cmMakefile* mf)
"all generators must specify this->FindMakeProgramFile");
return false;
}
if (!mf->GetDefinition("CMAKE_MAKE_PROGRAM") ||
cmIsOff(mf->GetDefinition("CMAKE_MAKE_PROGRAM"))) {
if (cmIsOff(mf->GetDefinition("CMAKE_MAKE_PROGRAM"))) {
std::string setMakeProgram = mf->GetModulesFile(this->FindMakeProgramFile);
if (!setMakeProgram.empty()) {
mf->ReadListFile(setMakeProgram);
}
}
if (!mf->GetDefinition("CMAKE_MAKE_PROGRAM") ||
cmIsOff(mf->GetDefinition("CMAKE_MAKE_PROGRAM"))) {
if (cmIsOff(mf->GetDefinition("CMAKE_MAKE_PROGRAM"))) {
std::ostringstream err;
err << "CMake was unable to find a build program corresponding to \""
<< this->GetName() << "\". CMAKE_MAKE_PROGRAM is not set. You "

2
Source/cmGraphVizWriter.cxx
View File

@@ -260,7 +260,7 @@ void cmGraphVizWriter::ReadSettings(
do { \
const char* value = mf.GetDefinition(cmakeDefinition); \
if (value) { \
(var) = mf.IsOn(cmakeDefinition); \
(var) = cmIsOn(value); \
} \
} while (false)