summaryrefslogtreecommitdiffstats
path: root/Source/cmNinjaTargetGenerator.cxx
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-03-27 19:56:13 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-03-27 19:56:13 (GMT)
commitef309e94cb85d359db3cbf0aac3e7e290a0125f0 (patch)
tree0153a775848b86a7b4ee4b4ff23597051fcef11c /Source/cmNinjaTargetGenerator.cxx
parent77ec098b44ea036078a574754b6c935837a2fd75 (diff)
parent6b5614f1642dcb75fd9de9571c813b21e4f9ce2b (diff)
downloadCMake-ef309e94cb85d359db3cbf0aac3e7e290a0125f0.zip
CMake-ef309e94cb85d359db3cbf0aac3e7e290a0125f0.tar.gz
CMake-ef309e94cb85d359db3cbf0aac3e7e290a0125f0.tar.bz2
Merge topic 'ninja-generator'
6b5614f Ninja: Substitute <OBJECT> and <CMAKE_C_COMPILER> in depfile flags
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
-rw-r--r--Source/cmNinjaTargetGenerator.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 4c4a53f..c76d175 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -339,6 +339,10 @@ cmNinjaTargetGenerator
depfile = "$out.d";
cmSystemTools::ReplaceString(depfileFlagsStr, "<DEPFILE>",
depfile.c_str());
+ cmSystemTools::ReplaceString(depfileFlagsStr, "<OBJECT>",
+ "$out");
+ cmSystemTools::ReplaceString(depfileFlagsStr, "<CMAKE_C_COMPILER>",
+ this->GetMakefile()->GetDefinition("CMAKE_C_COMPILER"));
flags += " " + depfileFlagsStr;
}
vars.Flags = flags.c_str();