diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-21 12:57:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-21 12:57:33 (GMT) |
| commit | c7428e1729239264af84cb9ecb6f05f0b1e04e84 (patch) | |
| tree | bf237aa6ab7120e8740fe4cbe7eaaf6f93e1d297 /Source/cmLocalUnixMakefileGenerator3.cxx | |
| parent | 177b5fb61b6d1fc64c70ea3bf65652ccad690dd5 (diff) | |
| parent | 25caf7bafeb18d9394eb2d13686970c68e9ad88c (diff) | |
| download | CMake-c7428e1729239264af84cb9ecb6f05f0b1e04e84.zip CMake-c7428e1729239264af84cb9ecb6f05f0b1e04e84.tar.gz CMake-c7428e1729239264af84cb9ecb6f05f0b1e04e84.tar.bz2 | |
Merge topic 'read-list-file'
25caf7bafe cmMakefile::ReadListFile() accepts std::string argument
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2821
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 9f42a92..e590e52 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1364,8 +1364,7 @@ bool cmLocalUnixMakefileGenerator3::ScanDependencies( std::string dirInfoFile = this->GetCurrentBinaryDirectory(); dirInfoFile += cmake::GetCMakeFilesDirectory(); dirInfoFile += "/CMakeDirectoryInformation.cmake"; - if (mf->ReadListFile(dirInfoFile.c_str()) && - !cmSystemTools::GetErrorOccuredFlag()) { + if (mf->ReadListFile(dirInfoFile) && !cmSystemTools::GetErrorOccuredFlag()) { haveDirectoryInfo = true; } |