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/CTest/cmCTestLaunch.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/CTest/cmCTestLaunch.cxx')
| -rw-r--r-- | Source/CTest/cmCTestLaunch.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx index 5218993..ec3307f 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -619,7 +619,7 @@ void cmCTestLaunch::LoadConfig() cmMakefile mf(&gg, cm.GetCurrentSnapshot()); std::string fname = this->LogDir; fname += "CTestLaunchConfig.cmake"; - if (cmSystemTools::FileExists(fname) && mf.ReadListFile(fname.c_str())) { + if (cmSystemTools::FileExists(fname) && mf.ReadListFile(fname)) { this->SourceDir = mf.GetSafeDefinition("CTEST_SOURCE_DIRECTORY"); cmSystemTools::ConvertToUnixSlashes(this->SourceDir); } |