diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-10-15 08:42:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-10-17 20:24:14 (GMT) |
| commit | 2a6bd96c1354484b4f9e71d11422f8da028c1622 (patch) | |
| tree | c31212f22e9e5f0d05ab36b874f642d11f828c61 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 79edd00235091475d5b3f1305bcf991cad3e45f4 (diff) | |
| download | CMake-2a6bd96c1354484b4f9e71d11422f8da028c1622.zip CMake-2a6bd96c1354484b4f9e71d11422f8da028c1622.tar.gz CMake-2a6bd96c1354484b4f9e71d11422f8da028c1622.tar.bz2 | |
Fix config-specific INCLUDE_DIRECTORIES in multi-config generators
Commit 08cb4fa4 (Process generator expressions in the
INCLUDE_DIRECTORIES property, 2012-09-18) contained an incorrect
assumption that CMAKE_BUILD_TYPE was set on the makefile for each
generated configuration in multi-config generators. Fix that by making
the GetIncludeDirectories API depend on the config.
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index ab57a32..1e37ca5 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1586,12 +1586,13 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups() std::vector<std::string> *configs = static_cast<cmGlobalVisualStudio7Generator *> (this->GlobalGenerator)->GetConfigurations(); - std::vector<std::string> includes; - this->LocalGenerator->GetIncludeDirectories(includes, - this->GeneratorTarget); for(std::vector<std::string>::iterator i = configs->begin(); i != configs->end(); ++i) { + std::vector<std::string> includes; + this->LocalGenerator->GetIncludeDirectories(includes, + this->GeneratorTarget, + "C", i->c_str()); this->WritePlatformConfigTag("ItemDefinitionGroup", i->c_str(), 1); *this->BuildFileStream << "\n"; // output cl compile flags <ClCompile></ClCompile> |