diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2019-01-17 17:36:07 (GMT) |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2019-01-17 17:36:07 (GMT) |
| commit | 25caf7bafeb18d9394eb2d13686970c68e9ad88c (patch) | |
| tree | 11fe6f264cf7b71fe62d725d0c345a10811ed612 /Source/cmake.cxx | |
| parent | 68e20f674a48be38d60e129f600faf7c483f2b97 (diff) | |
| download | CMake-25caf7bafeb18d9394eb2d13686970c68e9ad88c.zip CMake-25caf7bafeb18d9394eb2d13686970c68e9ad88c.tar.gz CMake-25caf7bafeb18d9394eb2d13686970c68e9ad88c.tar.bz2 | |
cmMakefile::ReadListFile() accepts std::string argument
Same for cmMakefile::ReadDependentFile(); some cleanup
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 9fcfbde..12d39f0 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -533,7 +533,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args) mf->SetArgcArgv(args); std::string systemFile = mf->GetModulesFile("CMakeFindPackageMode.cmake"); - mf->ReadListFile(systemFile.c_str()); + mf->ReadListFile(systemFile); std::string language = mf->GetSafeDefinition("LANGUAGE"); std::string mode = mf->GetSafeDefinition("MODE"); @@ -2031,7 +2031,7 @@ int cmake::CheckBuildSystem() cm.GetCurrentSnapshot().SetDefaultDefinitions(); cmGlobalGenerator gg(&cm); cmMakefile mf(&gg, cm.GetCurrentSnapshot()); - if (!mf.ReadListFile(this->CheckBuildSystemArgument.c_str()) || + if (!mf.ReadListFile(this->CheckBuildSystemArgument) || cmSystemTools::GetErrorOccuredFlag()) { if (verbose) { std::ostringstream msg; |