diff options
Diffstat (limited to 'Source/cmExtraEclipseCDT4Generator.cxx')
| -rw-r--r-- | Source/cmExtraEclipseCDT4Generator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 824f5ed..70d373c 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -248,17 +248,17 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(std::ostream& out, // now we have both, decide which one to use std::string valueToUse; - if (!envVarSet && cacheValue == nullptr) { + if (!envVarSet && !cacheValue) { // nothing known, do nothing valueToUse.clear(); - } else if (envVarSet && cacheValue == nullptr) { + } else if (envVarSet && !cacheValue) { // The variable is in the env, but not in the cache. Use it and put it // in the cache valueToUse = envVarValue; mf->AddCacheDefinition(cacheEntryName, valueToUse, cacheEntryName.c_str(), cmStateEnums::STRING, true); mf->GetCMakeInstance()->SaveCache(lg.GetBinaryDirectory()); - } else if (!envVarSet && cacheValue != nullptr) { + } else if (!envVarSet && cacheValue) { // It is already in the cache, but not in the env, so use it from the cache valueToUse = *cacheValue; } else { |