summaryrefslogtreecommitdiffstats
path: root/Source/cmNinjaTargetGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-01-22 22:40:27 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-01-22 23:08:18 (GMT)
commitee38062be8ccdb7f4c53156ef00db0d42a41a6a7 (patch)
tree00ecedc8bcceb7bf2a548f0ee4e34ce69cc0f83e /Source/cmNinjaTargetGenerator.cxx
parent98bf613cd09e2187fa5002dac06e63d5450dbcf0 (diff)
downloadCMake-ee38062be8ccdb7f4c53156ef00db0d42a41a6a7.zip
CMake-ee38062be8ccdb7f4c53156ef00db0d42a41a6a7.tar.gz
CMake-ee38062be8ccdb7f4c53156ef00db0d42a41a6a7.tar.bz2
IncludeDirectories: Respect SYSTEM flag when using CONFIG genex.
Update the Makefile and Ninja generators to use the config when requesting the include flags.
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
-rw-r--r--Source/cmNinjaTargetGenerator.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index c019ceb..67824c6 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -170,8 +170,10 @@ cmNinjaTargetGenerator::ComputeFlagsForObject(cmSourceFile const* source,
std::string includeFlags =
this->LocalGenerator->GetIncludeFlags(includes, this->GeneratorTarget,
language,
- language == "RC" ? true : false); // full include paths for RC
+ language == "RC" ? true : false, // full include paths for RC
// needed by cmcldeps
+ false,
+ this->GetConfigName());
if(cmGlobalNinjaGenerator::IsMinGW())
cmSystemTools::ReplaceString(includeFlags, "\\", "/");