diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-27 11:49:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-27 11:49:30 (GMT) |
| commit | 7e3d81b1df9e2c192585d83300344546439e50bd (patch) | |
| tree | befbf08daebf622c4b2bf4f3ac91afdc8a4459d6 /Source/cmGetPropertyCommand.cxx | |
| parent | ae96b772fa8c957dfc4cbb334f45874bd4043966 (diff) | |
| parent | a7f2ff16a48486ec0ef5a1a2d73e13cf4106a50e (diff) | |
| download | CMake-7e3d81b1df9e2c192585d83300344546439e50bd.zip CMake-7e3d81b1df9e2c192585d83300344546439e50bd.tar.gz CMake-7e3d81b1df9e2c192585d83300344546439e50bd.tar.bz2 | |
Merge topic 'cmprop-state'
a7f2ff16a4 cmState::GetCacheEntryProperty: return cmProp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4522
Diffstat (limited to 'Source/cmGetPropertyCommand.cxx')
| -rw-r--r-- | Source/cmGetPropertyCommand.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx index 2c3adde..9623514 100644 --- a/Source/cmGetPropertyCommand.cxx +++ b/Source/cmGetPropertyCommand.cxx @@ -387,12 +387,13 @@ bool HandleCacheMode(cmExecutionStatus& status, const std::string& name, return false; } - const char* value = nullptr; + cmProp value = nullptr; if (status.GetMakefile().GetState()->GetCacheEntryValue(name)) { value = status.GetMakefile().GetState()->GetCacheEntryProperty( name, propertyName); } - StoreResult(infoType, status.GetMakefile(), variable, value); + StoreResult(infoType, status.GetMakefile(), variable, + value ? value->c_str() : nullptr); return true; } |