expand vars nwo for exists test
This commit is contained in:
parent
e07ea14e31
commit
d163cb7014
@ -75,7 +75,9 @@ bool cmElseCommand::InitialPass(std::vector<std::string> const& args)
|
|||||||
|
|
||||||
if (args.size() == 2 && (args[0] == "EXISTS"))
|
if (args.size() == 2 && (args[0] == "EXISTS"))
|
||||||
{
|
{
|
||||||
if(cmSystemTools::FileExists(args[1].c_str()))
|
std::string tmp = args[1];
|
||||||
|
m_Makefile->ExpandVariablesInString(tmp);
|
||||||
|
if(cmSystemTools::FileExists(tmp.c_str()))
|
||||||
{
|
{
|
||||||
f = new cmIfFunctionBlocker();
|
f = new cmIfFunctionBlocker();
|
||||||
}
|
}
|
||||||
|
@ -136,7 +136,9 @@ bool cmIfCommand::InitialPass(std::vector<std::string> const& args)
|
|||||||
|
|
||||||
if (args.size() == 2 && (args[0] == "EXISTS"))
|
if (args.size() == 2 && (args[0] == "EXISTS"))
|
||||||
{
|
{
|
||||||
if(!cmSystemTools::FileExists(args[1].c_str()))
|
std::string tmp = args[1];
|
||||||
|
m_Makefile->ExpandVariablesInString(tmp);
|
||||||
|
if(!cmSystemTools::FileExists(tmp.c_str()))
|
||||||
{
|
{
|
||||||
f = new cmIfFunctionBlocker();
|
f = new cmIfFunctionBlocker();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user