diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2019-03-11 19:19:31 (GMT) |
---|---|---|
committer | Sebastian Holtermann <sebholt@xwmw.org> | 2019-03-12 10:01:48 (GMT) |
commit | addd1ce4024498b00499f971ef065537209b51a6 (patch) | |
tree | 9a7ce45fe7340b17fff4aecc13ad61f9870589ed /Source/cmLocalUnixMakefileGenerator3.cxx | |
parent | 06a59f1bda3ee5e1990f664dc3e2dd6d1acba81c (diff) | |
download | CMake-addd1ce4024498b00499f971ef065537209b51a6.zip CMake-addd1ce4024498b00499f971ef065537209b51a6.tar.gz CMake-addd1ce4024498b00499f971ef065537209b51a6.tar.bz2 |
cmLocalUnixMakefileGenerator3: Move local strings into local brace scopes
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
-rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 33a31dd..5ce4ab1 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1292,10 +1292,10 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies( // If the directory information is newer than depend.internal, include dirs // may have changed. In this case discard all old dependencies. bool needRescanDirInfo = false; - std::string dirInfoFile = this->GetCurrentBinaryDirectory(); - dirInfoFile += "/CMakeFiles"; - dirInfoFile += "/CMakeDirectoryInformation.cmake"; { + std::string dirInfoFile = this->GetCurrentBinaryDirectory(); + dirInfoFile += "/CMakeFiles"; + dirInfoFile += "/CMakeDirectoryInformation.cmake"; int result; if (!ftc->FileTimeCompare(internalDependFile, dirInfoFile, &result) || result < 0) { @@ -1357,11 +1357,14 @@ bool cmLocalUnixMakefileGenerator3::ScanDependencies( // Read the directory information file. cmMakefile* mf = this->Makefile; bool haveDirectoryInfo = false; - std::string dirInfoFile = this->GetCurrentBinaryDirectory(); - dirInfoFile += "/CMakeFiles"; - dirInfoFile += "/CMakeDirectoryInformation.cmake"; - if (mf->ReadListFile(dirInfoFile) && !cmSystemTools::GetErrorOccuredFlag()) { - haveDirectoryInfo = true; + { + std::string dirInfoFile = this->GetCurrentBinaryDirectory(); + dirInfoFile += "/CMakeFiles"; + dirInfoFile += "/CMakeDirectoryInformation.cmake"; + if (mf->ReadListFile(dirInfoFile) && + !cmSystemTools::GetErrorOccuredFlag()) { + haveDirectoryInfo = true; + } } // Lookup useful directory information. |