mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

ENH: remove RAISE_SCOPE() again and instead add SET(<var> <value> PARENT_SCOPE)

Browse Source 
Alex
This commit is contained in:
Alexander Neundorf
2008-01-18 15:52:54 -05:00
parent e5a4da5b3c
commit fc8ce17433
10 changed files with 66 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Source/cmSetCommand.cxx
View File

@@ -74,29 +74,42 @@ bool cmSetCommand::InitialPass(std::vector<std::string> const& args)
std::string value; // optional
bool cache = false; // optional
bool force = false; // optional
bool parentScope = false;
cmCacheManager::CacheEntryType type
= cmCacheManager::STRING; // required if cache
const char* docstring = 0; // required if cache
std::string::size_type cacheStart = 0;
// look for FORCE argument
if (args.size() > 4 && args[args.size()-1] == "FORCE")
unsigned int ignoreLastArgs = 0;
// look for PARENT_SCOPE argument
if (args.size() > 1 && args[args.size()-1] == "PARENT_SCOPE")
{
force = true;
parentScope = true;
ignoreLastArgs++;
}
else
{
// look for FORCE argument
if (args.size() > 4 && args[args.size()-1] == "FORCE")
{
force = true;
ignoreLastArgs++;
}
// check for cache signature
if (args.size() > 3 && args[args.size() - 3 - (force ? 1 : 0)] == "CACHE")
{
cache = true;
ignoreLastArgs+=3;
}
}
// check for cache signature
if (args.size() > 3 && args[args.size() - 3 - (force ? 1 : 0)] == "CACHE")
{
cache = true;
}
// collect any values into a single semi-colon seperated value list
if(static_cast<unsigned short>(args.size()) >
static_cast<unsigned short>(1 + (cache ? 3 : 0) + (force ? 1 : 0)))
static_cast<unsigned short>(1 + ignoreLastArgs))
{
value = args[1];
size_t endPos = args.size() - (cache ? 3 : 0) - (force ? 1 : 0);
size_t endPos = args.size() - ignoreLastArgs;
for(size_t i = 2; i < endPos; ++i)
{
value += ";";
@@ -104,6 +117,20 @@ bool cmSetCommand::InitialPass(std::vector<std::string> const& args)
}
}
if (parentScope)
{
if (value.empty())
{
this->Makefile->RaiseScope(variable, 0);
}
else
{
this->Makefile->RaiseScope(variable, value.c_str());
}
return true;
}
// we should be nice and try to catch some simple screwups if the last or
// next to last args are CACHE then they screwed up. If they used FORCE
// without CACHE they screwed up