diff options
| author | David Cole <david.cole@kitware.com> | 2012-02-22 16:31:00 -0500 |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2012-02-22 16:31:00 -0500 |
| commit | eabc9b0bc5d2dc237d247d1e86fb0818b22d31c0 (patch) | |
| tree | ffd3d150ba2a7a4b4056b2bdc31f0679214df5c9 /Source/cmNinjaTargetGenerator.cxx | |
| parent | bada88e8e45640afa5ef063aeab180fd6f1cfee4 (diff) | |
| download | cmake-eabc9b0bc5d2dc237d247d1e86fb0818b22d31c0.tar.gz | |
Ninja: CMake: Adapt Ninja generator for per-target include dirs
The confluence of the ninja-generator and target-include-directories
branches conspired to produce a nice little compiler error when
they were both merged into 'next'...
Yay for Continuous dashboards!
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 7b1c7d924a..c776fcf407 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -145,8 +145,11 @@ cmNinjaTargetGenerator::ComputeFlagsForObject(cmSourceFile *source, // 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(language.c_str(), false); + this->LocalGenerator->GetIncludeFlags(includes, language.c_str(), false); this->LocalGenerator->AppendFlags(flags, includeFlags.c_str()); } |