summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-03-09 16:19:27 (GMT)
committerBrad King <brad.king@kitware.com>2009-03-09 16:19:27 (GMT)
commita86e81c3589d64a2a777b1b90490cb80b951d983 (patch)
treed704564ea129aa9b121bb1cd7c99b184700099d4 /Source/CTest
parentb9323d2dd6fd96505cca5132529e0e6b854bdf10 (diff)
downloadCMake-a86e81c3589d64a2a777b1b90490cb80b951d983.zip
CMake-a86e81c3589d64a2a777b1b90490cb80b951d983.tar.gz
CMake-a86e81c3589d64a2a777b1b90490cb80b951d983.tar.bz2
ENH: Generate a central list of target directories
This generalizes the previous CMakeFiles/LabelFiles.txt created at the top of the build tree to a CMakeFiles/TargetDirectories.txt file. It lists the target support directories for all targets in the project. Labels can still be loaded by looking for Labels.txt files in each target directory.
Diffstat (limited to 'Source/CTest')
-rw-r--r--Source/CTest/cmCTestCoverageHandler.cxx15
-rw-r--r--Source/CTest/cmCTestCoverageHandler.h4
2 files changed, 13 insertions, 6 deletions
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 1faf05a..fa9a220 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -1749,9 +1749,9 @@ void cmCTestCoverageHandler::LoadLabels()
{
std::string fileList = this->CTest->GetBinaryDir();
fileList += cmake::GetCMakeFilesDirectory();
- fileList += "/LabelFiles.txt";
+ fileList += "/TargetDirectories.txt";
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
- " label file list [" << fileList << "]\n");
+ " target directory list [" << fileList << "]\n");
std::ifstream finList(fileList.c_str());
std::string line;
while(cmSystemTools::GetLineFromStream(finList, line))
@@ -1761,11 +1761,18 @@ void cmCTestCoverageHandler::LoadLabels()
}
//----------------------------------------------------------------------
-void cmCTestCoverageHandler::LoadLabels(const char* fname)
+void cmCTestCoverageHandler::LoadLabels(const char* dir)
{
+ std::string fname = dir;
+ fname += "/Labels.txt";
+ std::ifstream fin(fname.c_str());
+ if(!fin)
+ {
+ return;
+ }
+
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
" loading labels from [" << fname << "]\n");
- std::ifstream fin(fname);
bool inTarget = true;
std::string source;
std::string line;
diff --git a/Source/CTest/cmCTestCoverageHandler.h b/Source/CTest/cmCTestCoverageHandler.h
index 48894fb..46bcec1 100644
--- a/Source/CTest/cmCTestCoverageHandler.h
+++ b/Source/CTest/cmCTestCoverageHandler.h
@@ -152,9 +152,9 @@ private:
std::vector<std::string> Labels;
int GetLabelId(std::string const& label);
- // Load reading and writing methods.
+ // Label reading and writing methods.
void LoadLabels();
- void LoadLabels(const char* fname);
+ void LoadLabels(const char* dir);
void WriteXMLLabels(std::ofstream& os, std::string const& source);
// Label-based filtering.