diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-25 12:59:37 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-25 13:01:26 (GMT) |
| commit | 40745ad35ac57b437dcd6d74e846e9cd9743808f (patch) | |
| tree | 61d36e870f9a922c775fd7b4b2eb362ddc13fd07 /Source/CTest | |
| parent | c18fc30d1a0c67780fdea4ccd0a84a601ad7e8ef (diff) | |
| parent | 3e867ed4003e33ace2de6027f9bedb9aa7718b0c (diff) | |
| download | CMake-40745ad35ac57b437dcd6d74e846e9cd9743808f.zip CMake-40745ad35ac57b437dcd6d74e846e9cd9743808f.tar.gz CMake-40745ad35ac57b437dcd6d74e846e9cd9743808f.tar.bz2 | |
Merge topic 'cmake-files-directory'
3e867ed400 cmake: inlined files dir constant and removed it from cmake.h
Acked-by: Kitware Robot <kwrobot@kitware.com>
Rejected-by: vvs31415 <vstakhovsky@fastmail.com>
Merge-request: !2655
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 6c68f46..e39e25a 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" @@ -2226,7 +2225,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 ec3307f..5e66e05 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -283,7 +283,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"; |