diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-11 12:15:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-04-15 15:43:50 (GMT) |
| commit | 5d056c0dd85934e7a985cb49f97c343e38f20929 (patch) | |
| tree | b3a091e3886ba1de176fcfac7d93075a01310e22 /Source/cmMakefile.cxx | |
| parent | de722d7d63866613aaa8105b52ee90ffe2721136 (diff) | |
| download | CMake-5d056c0dd85934e7a985cb49f97c343e38f20929.zip CMake-5d056c0dd85934e7a985cb49f97c343e38f20929.tar.gz CMake-5d056c0dd85934e7a985cb49f97c343e38f20929.tar.bz2 | |
Port Global property interaction to cmState.
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 2fe1e33..205508b 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4239,7 +4239,7 @@ const char *cmMakefile::GetProperty(const std::string& prop, return this->LocalGenerator->GetParent()->GetMakefile()-> GetProperty(prop, scope); } - return this->GetCMakeInstance()->GetProperty(prop); + return this->GetState()->GetGlobalProperty(prop); } return retVal; @@ -4585,7 +4585,8 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg, this->LocalGenerator->GetGlobalGenerator()->GetCMakeInstance(); if(isCustom && existing->GetType() == cmTarget::UTILITY && this != existing->GetMakefile() && - cm->GetPropertyAsBool("ALLOW_DUPLICATE_CUSTOM_TARGETS")) + cm->GetState() + ->GetGlobalPropertyAsBool("ALLOW_DUPLICATE_CUSTOM_TARGETS")) { return true; } |