From eabc9b0bc5d2dc237d247d1e86fb0818b22d31c0 Mon Sep 17 00:00:00 2001 From: David Cole Date: Wed, 22 Feb 2012 16:31:00 -0500 Subject: [PATCH] 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! --- Source/cmNinjaTargetGenerator.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 7b1c7d924..c776fcf40 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 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()); }