summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-07-18 12:35:50 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-07-18 12:39:51 (GMT)
commita622b829bd5fdb38c82fd3810e1b1f8cdb5ee0d8 (patch)
treea8629187ebd83fec675599f5b1491c93cb04a456
parent52f22616852e6a6e8f642f84fa821e0c8678a679 (diff)
downloadCMake-a622b829bd5fdb38c82fd3810e1b1f8cdb5ee0d8.zip
CMake-a622b829bd5fdb38c82fd3810e1b1f8cdb5ee0d8.tar.gz
CMake-a622b829bd5fdb38c82fd3810e1b1f8cdb5ee0d8.tar.bz2
cmGetCMakePropertyCommand: Clean up VARIABLES handling.
-rw-r--r--Source/cmGetCMakePropertyCommand.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index a460ca6..5a1644c 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -32,10 +32,9 @@ bool cmGetCMakePropertyCommand
if ( args[1] == "VARIABLES" )
{
- std::vector<std::string> vars = this->Makefile->GetDefinitions();
- if (!vars.empty())
+ if (const char* varsProp = this->Makefile->GetProperty("VARIABLES"))
{
- output = cmJoin(vars, ";");
+ output = varsProp;
}
}
else if ( args[1] == "MACROS" )