diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmElseCommand.cxx | 4 | ||||
| -rw-r--r-- | Source/cmIfCommand.cxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmElseCommand.cxx b/Source/cmElseCommand.cxx index c04dbeb..984397a 100644 --- a/Source/cmElseCommand.cxx +++ b/Source/cmElseCommand.cxx @@ -75,7 +75,9 @@ bool cmElseCommand::InitialPass(std::vector<std::string> const& args) 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(); } diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx index 83da56f..b86a754 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -136,7 +136,9 @@ bool cmIfCommand::InitialPass(std::vector<std::string> const& args) 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(); } |