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/cmLoadCacheCommand.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/cmLoadCacheCommand.cxx')
| -rw-r--r-- | Source/cmLoadCacheCommand.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/cmLoadCacheCommand.cxx b/Source/cmLoadCacheCommand.cxx index 9ea56e6..988cec5 100644 --- a/Source/cmLoadCacheCommand.cxx +++ b/Source/cmLoadCacheCommand.cxx @@ -18,13 +18,12 @@ // cmLoadcacheCommand -bool cmLoadCacheCommand::InitialPass(std::vector<std::string> const& argsIn) +bool cmLoadCacheCommand::InitialPass(std::vector<std::string> const& args) { - if (argsIn.size()< 1) + if (args.size()< 1) { this->SetError("called with wrong number of arguments."); } - std::vector<std::string> args = argsIn; // Cache entries to be excluded from the import list. // If this set is empty, all cache entries are brought in @@ -37,7 +36,6 @@ bool cmLoadCacheCommand::InitialPass(std::vector<std::string> const& argsIn) { if (excludeFiles) { - m_Makefile->ExpandVariablesInString(args[i]); excludes.insert(args[i]); } if (args[i] == "EXCLUDE") @@ -60,7 +58,6 @@ bool cmLoadCacheCommand::InitialPass(std::vector<std::string> const& argsIn) { if (includeFiles) { - m_Makefile->ExpandVariablesInString(args[i]); includes.insert(args[i]); } if (args[i] == "INCLUDE_INTERNALS") @@ -81,7 +78,6 @@ bool cmLoadCacheCommand::InitialPass(std::vector<std::string> const& argsIn) { break; } - m_Makefile->ExpandVariablesInString(args[i]); cmCacheManager::GetInstance()->LoadCache(args[i].c_str(), false, excludes, includes); } |