summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorPeter Kuemmel <syntheticpp@gmx.net>2012-06-12 22:52:46 (GMT)
committerPeter Kuemmel <syntheticpp@gmx.net>2012-06-12 22:52:46 (GMT)
commit43200c145d9690701f0cc6dbd5c60ee3ece5edf8 (patch)
tree126a97e913a088f18bfb5d91e789f19b04d8eb27 /Source/cmLocalGenerator.cxx
parent12cc6434bfad53a4bc45b0ab36d27489346dfadc (diff)
downloadCMake-43200c145d9690701f0cc6dbd5c60ee3ece5edf8.zip
CMake-43200c145d9690701f0cc6dbd5c60ee3ece5edf8.tar.gz
CMake-43200c145d9690701f0cc6dbd5c60ee3ece5edf8.tar.bz2
Ninja: work with ninja/master, don't compile rc files with cl
Ninja generates for paths with spaces wrong results for $out.d, using the new DEP_FILE variable instead.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 8265d72..90ed270 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -872,6 +872,13 @@ cmLocalGenerator::ExpandRuleVariable(std::string const& variable,
return replaceValues.TargetPDB;
}
}
+ if(replaceValues.DependencyFile )
+ {
+ if(variable == "DEP_FILE")
+ {
+ return replaceValues.DependencyFile;
+ }
+ }
if(replaceValues.Target)
{