diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-03-05 23:41:24 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-03-05 23:41:24 (GMT) |
| commit | 4651dbcfc64836988649c2ca7e3e30c811723eb2 (patch) | |
| tree | 78393201554f92b9e59bc8c5893f6e28a2ab2dbb /Source/cmIncludeCommand.cxx | |
| parent | 2b9140f6b512784f65dfa58ff1b9076fd6f9227d (diff) | |
| download | CMake-4651dbcfc64836988649c2ca7e3e30c811723eb2.zip CMake-4651dbcfc64836988649c2ca7e3e30c811723eb2.tar.gz CMake-4651dbcfc64836988649c2ca7e3e30c811723eb2.tar.bz2 | |
ENH: expand variables in arguments before the commands get them
Diffstat (limited to 'Source/cmIncludeCommand.cxx')
| -rw-r--r-- | Source/cmIncludeCommand.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx index 9a59be2..6cda4a5 100644 --- a/Source/cmIncludeCommand.cxx +++ b/Source/cmIncludeCommand.cxx @@ -18,15 +18,13 @@ // cmIncludeCommand -bool cmIncludeCommand::InitialPass(std::vector<std::string> const& argsIn) +bool cmIncludeCommand::InitialPass(std::vector<std::string> const& args) { - if (argsIn.size()< 1 || argsIn.size() > 2) + if (args.size()< 1 || args.size() > 2) { this->SetError("called with wrong number of arguments. " "Include only takes one file."); } - std::vector<std::string> args = argsIn; - m_Makefile->ExpandVariablesInString( args[0]); bool exists = cmSystemTools::FileExists(args[0].c_str()); if(args.size() == 2 && args[1] == "OPTIONAL" && !exists) { |