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/cmake.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/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 06edeba..b97feab 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; |