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/cmExtraEclipseCDT4Generator.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/cmExtraEclipseCDT4Generator.cxx')
| -rw-r--r-- | Source/cmExtraEclipseCDT4Generator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index f1d9c31..689f213 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -890,7 +890,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const l != targets.end(); ++l) { std::vector<std::string> includeDirs; - (*it)->GetIncludeDirectories(includeDirs, l->second); + const char *config = mf->GetDefinition("CMAKE_BUILD_TYPE"); + (*it)->GetIncludeDirectories(includeDirs, l->second, "C", config); this->AppendIncludeDirectories(fout, includeDirs, emmited); } } |