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/cmExtraCodeBlocksGenerator.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/cmExtraCodeBlocksGenerator.cxx')
| -rw-r--r-- | Source/cmExtraCodeBlocksGenerator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 8b2daba..8d5bd4e 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -640,8 +640,10 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout, std::set<std::string> uniqIncludeDirs; std::vector<std::string> includes; + const char *config = target->GetMakefile() + ->GetDefinition("CMAKE_BUILD_TYPE"); target->GetMakefile()->GetLocalGenerator()-> - GetIncludeDirectories(includes, gtgt); + GetIncludeDirectories(includes, gtgt, "C", config); for(std::vector<std::string>::const_iterator dirIt=includes.begin(); dirIt != includes.end(); ++dirIt) |