diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-19 19:05:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-19 19:06:47 (GMT) |
| commit | 5f7386dd19c27690a1187a69f0861faf51899264 (patch) | |
| tree | 3d7a2453a1238709beea1456acb7b33c4706f9ad /Source/CTest | |
| parent | 0b8524baa68944ee148c8b48b4ee937ab315175d (diff) | |
| parent | da26b3be8948471dd2320d1e44af9eb5dfaa0f6a (diff) | |
| download | CMake-5f7386dd19c27690a1187a69f0861faf51899264.zip CMake-5f7386dd19c27690a1187a69f0861faf51899264.tar.gz CMake-5f7386dd19c27690a1187a69f0861faf51899264.tar.bz2 | |
Merge topic 'string-literal-append'
da26b3be89 avoid adding multiple consecutive string literals to std::string
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3698
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestCoverageHandler.cxx | 3 | ||||
| -rw-r--r-- | Source/CTest/cmCTestLaunch.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index 54fe612..2a68544 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -2223,8 +2223,7 @@ int cmCTestCoverageHandler::GetLabelId(std::string const& label) void cmCTestCoverageHandler::LoadLabels() { std::string fileList = this->CTest->GetBinaryDir(); - fileList += "/CMakeFiles"; - fileList += "/TargetDirectories.txt"; + fileList += "/CMakeFiles/TargetDirectories.txt"; cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " target directory list [" << fileList << "]\n", this->Quiet); diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx index 739cc58..4708a71 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -283,8 +283,7 @@ void cmCTestLaunch::LoadLabels() // Labels are listed in per-target files. std::string fname = this->OptionBuildDir; - fname += "/CMakeFiles"; - fname += "/"; + fname += "/CMakeFiles/"; fname += this->OptionTargetName; fname += ".dir/Labels.txt"; |