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/cmExtraEclipseCDT4Generator.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/cmExtraEclipseCDT4Generator.cxx')
| -rw-r--r-- | Source/cmExtraEclipseCDT4Generator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index b65f097..80d61c3 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -243,8 +243,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(std::ostream& out, const bool envVarSet = cmSystemTools::GetEnv(envVar, envVarValue); std::string cacheEntryName = cmStrCat("CMAKE_ECLIPSE_ENVVAR_", envVar); - const std::string* cacheValue = - lg.GetState()->GetInitializedCacheValue(cacheEntryName); + cmProp cacheValue = lg.GetState()->GetInitializedCacheValue(cacheEntryName); // now we have both, decide which one to use std::string valueToUse; |