kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGetCMakePropertyCommand: Clean up VARIABLES handling.

This commit is contained in:
Stephen Kelly 2015-07-18 14:35:50 +02:00
parent 52f2261685
commit a622b829bd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmGetCMakePropertyCommand.cxx
View File

@ -32,10 +32,9 @@ bool cmGetCMakePropertyCommand
if ( args[1] == "VARIABLES" ) if ( args[1] == "VARIABLES" )
{ {
std::vector<std::string> vars = this->Makefile->GetDefinitions(); if (const char* varsProp = this->Makefile->GetProperty("VARIABLES"))
if (!vars.empty())
{ {
output = cmJoin(vars, ";"); output = varsProp;
} }
} }
else if ( args[1] == "MACROS" ) else if ( args[1] == "MACROS" )