summaryrefslogtreecommitdiffstats
path: root/Source/cmCTest.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-04-11 12:15:55 (GMT)
committerBrad King <brad.king@kitware.com>2015-04-15 15:43:50 (GMT)
commit5d056c0dd85934e7a985cb49f97c343e38f20929 (patch)
treeb3a091e3886ba1de176fcfac7d93075a01310e22 /Source/cmCTest.cxx
parentde722d7d63866613aaa8105b52ee90ffe2721136 (diff)
downloadCMake-5d056c0dd85934e7a985cb49f97c343e38f20929.zip
CMake-5d056c0dd85934e7a985cb49f97c343e38f20929.tar.gz
CMake-5d056c0dd85934e7a985cb49f97c343e38f20929.tar.bz2
Port Global property interaction to cmState.
Diffstat (limited to 'Source/cmCTest.cxx')
-rw-r--r--Source/cmCTest.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index d54a651..cd2cd7c 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -27,6 +27,7 @@
#include "cmCTestCommand.h"
#include "cmCTestStartCommand.h"
#include "cmAlgorithms.h"
+#include "cmState.h"
#include "cmCTestBuildHandler.h"
#include "cmCTestBuildAndTestHandler.h"
@@ -1558,12 +1559,14 @@ void cmCTest::AddSiteProperties(std::ostream& ostr)
return;
}
// This code should go when cdash is changed to use labels only
- const char* subproject = cm->GetProperty("SubProject");
+ const char* subproject = cm->GetState()
+ ->GetGlobalProperty("SubProject");
if(subproject)
{
ostr << "<Subproject name=\"" << subproject << "\">\n";
const char* labels =
- ch->GetCMake()->GetProperty("SubProjectLabels");
+ ch->GetCMake()->GetState()
+ ->GetGlobalProperty("SubProjectLabels");
if(labels)
{
ostr << " <Labels>\n";
@@ -1581,7 +1584,7 @@ void cmCTest::AddSiteProperties(std::ostream& ostr)
}
// This code should stay when cdash only does label based sub-projects
- const char* label = cm->GetProperty("Label");
+ const char* label = cm->GetState()->GetGlobalProperty("Label");
if(label)
{
ostr << "<Labels>\n";