summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBerk Geveci <berk.geveci@kitware.com>2001-11-27 22:32:33 (GMT)
committerBerk Geveci <berk.geveci@kitware.com>2001-11-27 22:32:33 (GMT)
commit1944e1887df5a08abb9969268b0f8be272275c01 (patch)
treeeab5052a829bf3b917a1d8ddf944c3e9f800c6f4
parent317324976188dd700beecb8c2480f7ee10e9b21a (diff)
downloadCMake-1944e1887df5a08abb9969268b0f8be272275c01.zip
CMake-1944e1887df5a08abb9969268b0f8be272275c01.tar.gz
CMake-1944e1887df5a08abb9969268b0f8be272275c01.tar.bz2
ENH: expand variables in a command before escaping spaces in the command
-rw-r--r--Source/cmMakefile.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 377ebd2..696b89b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -471,7 +471,9 @@ void cmMakefile::AddCustomCommand(const char* source,
// find the target,
if (m_Targets.find(target) != m_Targets.end())
{
- std::string c = cmSystemTools::EscapeSpaces(command);
+ std::string expandC = command;
+ this->ExpandVariablesInString(expandC);
+ std::string c = cmSystemTools::EscapeSpaces(expandC.c_str());
std::string combinedArgs;
unsigned int i;