summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-02-22 21:31:00 (GMT)
committerDavid Cole <david.cole@kitware.com>2012-02-22 21:31:00 (GMT)
commiteabc9b0bc5d2dc237d247d1e86fb0818b22d31c0 (patch)
treeffd3d150ba2a7a4b4056b2bdc31f0679214df5c9
parentbada88e8e45640afa5ef063aeab180fd6f1cfee4 (diff)
downloadCMake-eabc9b0bc5d2dc237d247d1e86fb0818b22d31c0.zip
CMake-eabc9b0bc5d2dc237d247d1e86fb0818b22d31c0.tar.gz
CMake-eabc9b0bc5d2dc237d247d1e86fb0818b22d31c0.tar.bz2
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!
-rw-r--r--Source/cmNinjaTargetGenerator.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 7b1c7d9..c776fcf 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());
}