diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-25 12:39:19 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-25 12:39:26 (GMT) |
| commit | d13d5c11cf8b5878c5e63b067e73a2175f01d93f (patch) | |
| tree | 51e040ccf9f556d80f74e308a74d82676e65f42d /Source/cmState.cxx | |
| parent | 79415fa6d361e6b3dbdd8f945f63f7aed1eae102 (diff) | |
| parent | 0bf0e35e5943891c963860f2339339ad43020d60 (diff) | |
| download | CMake-d13d5c11cf8b5878c5e63b067e73a2175f01d93f.zip CMake-d13d5c11cf8b5878c5e63b067e73a2175f01d93f.tar.gz CMake-d13d5c11cf8b5878c5e63b067e73a2175f01d93f.tar.bz2 | |
Merge topic 'cmprop-cache'
0bf0e35e59 cmCacheManager::GetProperty: return cmProp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4503
Diffstat (limited to 'Source/cmState.cxx')
| -rw-r--r-- | Source/cmState.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmState.cxx b/Source/cmState.cxx index bc08223..b1fa772 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -199,7 +199,8 @@ const char* cmState::GetCacheEntryProperty(std::string const& key, if (!it.PropertyExists(propertyName)) { return nullptr; } - return it.GetProperty(propertyName); + cmProp retVal = it.GetProperty(propertyName); + return retVal ? retVal->c_str() : nullptr; } bool cmState::GetCacheEntryPropertyAsBool(std::string const& key, |