diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2012-07-15 12:47:02 (GMT) |
|---|---|---|
| committer | Peter Kümmel <syntheticpp@gmx.net> | 2012-07-15 16:23:04 (GMT) |
| commit | 84a18cb5d659602235cc995497f5fb016560d553 (patch) | |
| tree | 1ee663f7c1a10cc574b6b58e282426a23b481909 /Source/cmNinjaTargetGenerator.cxx | |
| parent | 42592966c514015cef070d6b24a0c29f22ac2999 (diff) | |
| download | CMake-84a18cb5d659602235cc995497f5fb016560d553.zip CMake-84a18cb5d659602235cc995497f5fb016560d553.tar.gz CMake-84a18cb5d659602235cc995497f5fb016560d553.tar.bz2 | |
Ninja: also stop when .rc's .d file couldn't be generated
prevents silent disappearing of .d files for resource files.
cmcldeps changes directory for cl call, so relativ include paths do not work.
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 4758989..7eb3d9e 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -143,16 +143,18 @@ cmNinjaTargetGenerator::ComputeFlagsForObject(cmSourceFile *source, this->LocalGenerator->AddCMP0018Flags(flags, this->Target, language.c_str()); - // TODO: Handle response file. // Add include directory flags. { std::vector<std::string> includes; this->LocalGenerator->GetIncludeDirectories(includes, this->Target, language.c_str()); std::string includeFlags = - this->LocalGenerator->GetIncludeFlags(includes, language.c_str(), false); + this->LocalGenerator->GetIncludeFlags(includes, language.c_str(), + language == "RC" ? true : false); // full include paths for RC + // needed by cmcldeps if(cmGlobalNinjaGenerator::IsMinGW()) cmSystemTools::ReplaceString(includeFlags, "\\", "/"); + this->LocalGenerator->AppendFlags(flags, includeFlags.c_str()); } |