kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Allow IF(DEFINED ENV{somevar}) to work.

This commit is contained in:
Brad King 2006-02-10 14:41:31 -05:00
parent 8de6e9557b
commit 84923605cf
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmIfCommand.cxx
View File

@ -262,7 +262,17 @@ bool cmIfCommand::IsTrue(const std::vector<std::string> &args,
// is a variable defined // is a variable defined
if (*arg == "DEFINED" && argP1 != newArgs.end()) if (*arg == "DEFINED" && argP1 != newArgs.end())
{ {
def = makefile->GetDefinition((argP1)->c_str()); unsigned int argP1len = argP1->size();
if(argP1len > 4 && argP1->substr(0, 4) == "ENV{" &&
argP1->operator[](argP1len-1) == '}')
{
std::string env = argP1->substr(4, argP1len-5);
def = cmSystemTools::GetEnv(env.c_str());
}
else
{
def = makefile->GetDefinition((argP1)->c_str());
}
if(def) if(def)
{ {
*arg = "1"; *arg = "1";