summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-12-21 19:03:24 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2010-12-21 19:03:24 (GMT)
commit31b0657e7d4bab3e6c5a00c1318d1c231d8ab44b (patch)
tree5f16dfb9e9d73794a6c791147a6614b8e5492e2a /Source/cmMakefile.cxx
parent533f5a20372829aa41a71ed4698cac2a50820a7e (diff)
parent4499d50ad2df7c1db4335d40f9fa20c642f59a5d (diff)
downloadCMake-31b0657e7d4bab3e6c5a00c1318d1c231d8ab44b.zip
CMake-31b0657e7d4bab3e6c5a00c1318d1c231d8ab44b.tar.gz
CMake-31b0657e7d4bab3e6c5a00c1318d1c231d8ab44b.tar.bz2
Merge topic 'custom-command-generator-expressions'
4499d50 Mark CustomCommand test perconfig.out as SYMBOLIC f0cdb60 Introduce "generator expression" syntax to custom commands (#11209) 4749e4c Record set of targets used in cmGeneratorExpression ef9e9de Optionally suppress errors in cmGeneratorExpression 45e1953 Factor per-config sample targets out of 'Testing' test 4091bca Factor generator expression docs out of add_test bfb7288 Record backtrace in cmCustomCommand
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 1463680..cf03b80 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -827,7 +827,8 @@ cmMakefile::AddCustomCommandToTarget(const char* target,
{
// Add the command to the appropriate build step for the target.
std::vector<std::string> no_output;
- cmCustomCommand cc(no_output, depends, commandLines, comment, workingDir);
+ cmCustomCommand cc(this, no_output, depends,
+ commandLines, comment, workingDir);
cc.SetEscapeOldStyle(escapeOldStyle);
cc.SetEscapeAllowMakeVars(true);
switch(type)
@@ -947,7 +948,7 @@ cmMakefile::AddCustomCommandToOutput(const std::vector<std::string>& outputs,
if(file)
{
cmCustomCommand* cc =
- new cmCustomCommand(outputs, depends2, commandLines,
+ new cmCustomCommand(this, outputs, depends2, commandLines,
comment, workingDir);
cc->SetEscapeOldStyle(escapeOldStyle);
cc->SetEscapeAllowMakeVars(true);