diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-01 12:29:37 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-01 12:31:32 (GMT) |
| commit | 0b08c1279cbc65b6622894b5ca3b55c61c12cb0c (patch) | |
| tree | 7d1839d8915ad044d3700b14c46ba8a2b53f248a /Source/cmMakefile.cxx | |
| parent | 255c95163a3fed079167400aa5e978e403ca72fb (diff) | |
| parent | e267c3fddf68dc27a0e756a5d7f5dc618bf3f7eb (diff) | |
| download | CMake-0b08c1279cbc65b6622894b5ca3b55c61c12cb0c.zip CMake-0b08c1279cbc65b6622894b5ca3b55c61c12cb0c.tar.gz CMake-0b08c1279cbc65b6622894b5ca3b55c61c12cb0c.tar.bz2 | |
Merge topic 'cmprop-state'
e267c3fddf cmState::GetInitializedCacheValue: return cmProp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4696
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 979b9d8..6c46353 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1880,8 +1880,7 @@ void cmMakefile::AddCacheDefinition(const std::string& name, const char* value, cmStateEnums::CacheEntryType type, bool force) { - const std::string* existingValue = - this->GetState()->GetInitializedCacheValue(name); + cmProp existingValue = this->GetState()->GetInitializedCacheValue(name); // must be outside the following if() to keep it alive long enough std::string nvalue; @@ -2682,7 +2681,7 @@ const std::string& cmMakefile::GetRequiredDefinition( bool cmMakefile::IsDefinitionSet(const std::string& name) const { - const std::string* def = this->StateSnapshot.GetDefinition(name); + cmProp def = this->StateSnapshot.GetDefinition(name); if (!def) { def = this->GetState()->GetInitializedCacheValue(name); } @@ -2699,7 +2698,7 @@ bool cmMakefile::IsDefinitionSet(const std::string& name) const const std::string* cmMakefile::GetDef(const std::string& name) const { - const std::string* def = this->StateSnapshot.GetDefinition(name); + cmProp def = this->StateSnapshot.GetDefinition(name); if (!def) { def = this->GetState()->GetInitializedCacheValue(name); } |