diff options
| author | Bruno Manganelli <bruno.manga95@gmail.com> | 2018-11-22 21:05:05 (GMT) |
|---|---|---|
| committer | Bruno Manganelli <bruno.manga95@gmail.com> | 2019-01-21 15:34:16 (GMT) |
| commit | 3e867ed4003e33ace2de6027f9bedb9aa7718b0c (patch) | |
| tree | 9fe1b65a8b7e96c9a964761089dd1d48d5385937 /Source/CTest | |
| parent | c144db1b8ca1ea2e3dad397123f110956a439030 (diff) | |
| download | CMake-3e867ed4003e33ace2de6027f9bedb9aa7718b0c.zip CMake-3e867ed4003e33ace2de6027f9bedb9aa7718b0c.tar.gz CMake-3e867ed4003e33ace2de6027f9bedb9aa7718b0c.tar.bz2 | |
cmake: inlined files dir constant and removed it from cmake.h
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestCoverageHandler.cxx | 3 | ||||
| -rw-r--r-- | Source/CTest/cmCTestLaunch.cxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index fbd1038..d594db3 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -15,7 +15,6 @@ #include "cmSystemTools.h" #include "cmWorkingDirectory.h" #include "cmXMLWriter.h" -#include "cmake.h" #include "cmsys/FStream.hxx" #include "cmsys/Glob.hxx" @@ -2227,7 +2226,7 @@ int cmCTestCoverageHandler::GetLabelId(std::string const& label) void cmCTestCoverageHandler::LoadLabels() { std::string fileList = this->CTest->GetBinaryDir(); - fileList += cmake::GetCMakeFilesDirectory(); + fileList += "/CMakeFiles"; fileList += "/TargetDirectories.txt"; cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " target directory list [" << fileList << "]\n", diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx index 6cd1c09..60a86ee 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -282,7 +282,7 @@ void cmCTestLaunch::LoadLabels() // Labels are listed in per-target files. std::string fname = this->OptionBuildDir; - fname += cmake::GetCMakeFilesDirectory(); + fname += "/CMakeFiles"; fname += "/"; fname += this->OptionTargetName; fname += ".dir/Labels.txt"; |