mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-21 21:58:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

BUG: fix doc string and allow a variable to be promoted from non-cache to cache

Browse Source
This commit is contained in:
Bill Hoffman
2002-09-27 16:19:37 -04:00
parent cc6d56182d
commit eb6bba34cd
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmSetCommand.cxx
+9 -7
View File
@@ -107,19 +107,21 @@ bool cmSetCommand::InitialPass(std::vector<std::string> const& args)
type = cmCacheManager::StringToType(args[cacheStart+1].c_str());
docstring = args[cacheStart+2].c_str();
}
// get the current cache value for the variable
const char* cacheValue =
m_Makefile->GetDefinition(variable);
if(cacheValue)
// see if this is already in the cache
cmCacheManager::CacheIterator it =
m_Makefile->GetCacheManager()->GetCacheIterator(variable);
if(!it.IsAtEnd())
{
// if it is not a cached value, or it is a cached
// value that is not internal keep the value found
// in the cache
// if the set is trying to CACHE the value but the value
// is already in the cache and the type is not internal
// then leave now without setting any definitions in the cache
// or the makefile
if(cache && type != cmCacheManager::INTERNAL)
{
return true;
}
}
// if it is meant to be in the cache then define it in the cache
if(cache)
{