diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-23 13:15:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-23 13:16:15 (GMT) |
| commit | e898f48bbc944c5525f7f292b55cca8ae2fa4cae (patch) | |
| tree | 1eab1f09f2da7bb15a8caef4a087957be8d06311 /Source/cmMakefile.cxx | |
| parent | c1247d861a42fa79e7ca4cc9a793b1fa1f012dce (diff) | |
| parent | 2993fc347af5db802721f1bbe0a0e05d19a28e89 (diff) | |
| download | CMake-e898f48bbc944c5525f7f292b55cca8ae2fa4cae.zip CMake-e898f48bbc944c5525f7f292b55cca8ae2fa4cae.tar.gz CMake-e898f48bbc944c5525f7f292b55cca8ae2fa4cae.tar.bz2 | |
Merge topic 'getmodulesfile-string'
2993fc347a cmMakefile: GetModulesFile() accepts std::string param
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2838
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 9589b7f..500776e 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3516,7 +3516,7 @@ void cmMakefile::DisplayStatus(const char* message, float s) const cm->UpdateProgress(message, s); } -std::string cmMakefile::GetModulesFile(const char* filename, +std::string cmMakefile::GetModulesFile(const std::string& filename, bool& system) const { std::string result; |