summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestCoverageHandler.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-01-25 12:59:37 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-01-25 13:01:26 (GMT)
commit40745ad35ac57b437dcd6d74e846e9cd9743808f (patch)
tree61d36e870f9a922c775fd7b4b2eb362ddc13fd07 /Source/CTest/cmCTestCoverageHandler.cxx
parentc18fc30d1a0c67780fdea4ccd0a84a601ad7e8ef (diff)
parent3e867ed4003e33ace2de6027f9bedb9aa7718b0c (diff)
downloadCMake-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/cmCTestCoverageHandler.cxx')
-rw-r--r--Source/CTest/cmCTestCoverageHandler.cxx3
1 files changed, 1 insertions, 2 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",