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/cmMakefile.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/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index cacca1f..ae69b24 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3808,18 +3808,6 @@ cmVariableWatch *cmMakefile::GetVariableWatch() const } #endif -void cmMakefile::AddMacro(const char* name) -{ - assert(name); - this->MacrosList.push_back(name); -} - -void cmMakefile::GetListOfMacros(std::string& macros) const -{ - assert(macros.empty()); - macros = cmJoin(this->MacrosList, ";"); -} - cmState *cmMakefile::GetState() const { return this->GetCMakeInstance()->GetState(); @@ -4243,11 +4231,6 @@ const char *cmMakefile::GetProperty(const std::string& prop, output = cmJoin(this->GetDefinitions(), ";"); return output.c_str(); } - else if (prop == "MACROS") - { - this->GetListOfMacros(output); - return output.c_str(); - } else if (prop == "INCLUDE_DIRECTORIES") { std::string sep; |