echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmLocalUnixMakefileGenerator3: Move local strings into local brace scopes

Browse Source
This commit is contained in:
Sebastian Holtermann 2019-03-11 20:19:31 +01:00
parent 06a59f1bda
commit addd1ce402
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -1292,10 +1292,10 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(
// If the directory information is newer than depend.internal, include dirs // If the directory information is newer than depend.internal, include dirs
// may have changed. In this case discard all old dependencies. // may have changed. In this case discard all old dependencies.
bool needRescanDirInfo = false; bool needRescanDirInfo = false;
{
std::string dirInfoFile = this->GetCurrentBinaryDirectory(); std::string dirInfoFile = this->GetCurrentBinaryDirectory();
dirInfoFile += "/CMakeFiles"; dirInfoFile += "/CMakeFiles";
dirInfoFile += "/CMakeDirectoryInformation.cmake"; dirInfoFile += "/CMakeDirectoryInformation.cmake";
{
int result; int result;
if (!ftc->FileTimeCompare(internalDependFile, dirInfoFile, &result) || if (!ftc->FileTimeCompare(internalDependFile, dirInfoFile, &result) ||
result < 0) { result < 0) {
@ -1357,12 +1357,15 @@ bool cmLocalUnixMakefileGenerator3::ScanDependencies(
// Read the directory information file. // Read the directory information file.
cmMakefile* mf = this->Makefile; cmMakefile* mf = this->Makefile;
bool haveDirectoryInfo = false; bool haveDirectoryInfo = false;
{
std::string dirInfoFile = this->GetCurrentBinaryDirectory(); std::string dirInfoFile = this->GetCurrentBinaryDirectory();
dirInfoFile += "/CMakeFiles"; dirInfoFile += "/CMakeFiles";
dirInfoFile += "/CMakeDirectoryInformation.cmake"; dirInfoFile += "/CMakeDirectoryInformation.cmake";
if (mf->ReadListFile(dirInfoFile) && !cmSystemTools::GetErrorOccuredFlag()) { if (mf->ReadListFile(dirInfoFile) &&
!cmSystemTools::GetErrorOccuredFlag()) {
haveDirectoryInfo = true; haveDirectoryInfo = true;
} }
}
// Lookup useful directory information. // Lookup useful directory information.
if (haveDirectoryInfo) { if (haveDirectoryInfo) {