diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-21 13:22:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-07-21 13:22:23 (GMT) |
| commit | 5b2754d41fcef287ff76c9d909d9bc2f506b4d03 (patch) | |
| tree | 61e454cb8a0e13e58b50da681ffa2b728d89667c /Source/cmGetCMakePropertyCommand.cxx | |
| parent | e13c18974307ecd0f11e2ecfde64f1aea80c6304 (diff) | |
| parent | 41bb831fc910d85d79811dc367b25c0880cbe6ac (diff) | |
| download | CMake-5b2754d41fcef287ff76c9d909d9bc2f506b4d03.zip CMake-5b2754d41fcef287ff76c9d909d9bc2f506b4d03.tar.gz CMake-5b2754d41fcef287ff76c9d909d9bc2f506b4d03.tar.bz2 | |
Merge topic 'remove-special-MACROS-handling'
41bb831f cmMakefile: Remove special handling of MACROS property.
Diffstat (limited to 'Source/cmGetCMakePropertyCommand.cxx')
| -rw-r--r-- | Source/cmGetCMakePropertyCommand.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx index 5a1644c..248ce59 100644 --- a/Source/cmGetCMakePropertyCommand.cxx +++ b/Source/cmGetCMakePropertyCommand.cxx @@ -40,7 +40,10 @@ bool cmGetCMakePropertyCommand else if ( args[1] == "MACROS" ) { output.clear(); - this->Makefile->GetListOfMacros(output); + if (const char* macrosProp = this->Makefile->GetProperty("MACROS")) + { + output = macrosProp; + } } else if ( args[1] == "COMPONENTS" ) { |