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/cmMakefile.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/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 3ff576e..fa1769d 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -533,7 +533,8 @@ void cmMakefile::IncludeScope::EnforceCMP0011() } } -bool cmMakefile::ReadDependentFile(const char* filename, bool noPolicyScope) +bool cmMakefile::ReadDependentFile(const std::string& filename, + bool noPolicyScope) { this->AddDefinition("CMAKE_PARENT_LIST_FILE", this->GetDefinition("CMAKE_CURRENT_LIST_FILE")); @@ -586,7 +587,7 @@ private: bool ReportError; }; -bool cmMakefile::ReadListFile(const char* filename) +bool cmMakefile::ReadListFile(const std::string& filename) { std::string filenametoread = cmSystemTools::CollapseFullPath( filename, this->GetCurrentSourceDirectory()); |