diff options
| author | David Cole <david.cole@kitware.com> | 2012-10-17 16:44:53 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-10-17 16:44:53 -0400 |
| commit | f3b8049884354e166249f40c15df5a4907ace4ac (patch) | |
| tree | 8cf89afdbdafcb2ba4b18ace2c87b4665db0b6ad /Source/cmNinjaTargetGenerator.cxx | |
| parent | 982905c0d23aded548718cf64665002cac350e77 (diff) | |
| parent | 2a6bd96c1354484b4f9e71d11422f8da028c1622 (diff) | |
| download | cmake-f3b8049884354e166249f40c15df5a4907ace4ac.tar.gz | |
Merge topic 'fix-INCLUDE_DIRECTORIES-multiconfig'
2a6bd96 Fix config-specific INCLUDE_DIRECTORIES in multi-config generators
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 39f6aab300..0f10152087 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -152,8 +152,10 @@ cmNinjaTargetGenerator::ComputeFlagsForObject(cmSourceFile *source, // Add include directory flags. { std::vector<std::string> includes; - this->LocalGenerator->GetIncludeDirectories(includes, this->GeneratorTarget, - language.c_str()); + const char *config = this->Makefile->GetDefinition("CMAKE_BUILD_TYPE"); + this->LocalGenerator->GetIncludeDirectories(includes, + this->GeneratorTarget, + language.c_str(), config); std::string includeFlags = this->LocalGenerator->GetIncludeFlags(includes, language.c_str(), language == "RC" ? true : false); // full include paths for RC |