diff options
| author | David Cole <david.cole@kitware.com> | 2012-10-17 20:44:53 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-10-17 20:44:53 (GMT) |
| commit | f3b8049884354e166249f40c15df5a4907ace4ac (patch) | |
| tree | 8cf89afdbdafcb2ba4b18ace2c87b4665db0b6ad /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 982905c0d23aded548718cf64665002cac350e77 (diff) | |
| parent | 2a6bd96c1354484b4f9e71d11422f8da028c1622 (diff) | |
| download | CMake-f3b8049884354e166249f40c15df5a4907ace4ac.zip CMake-f3b8049884354e166249f40c15df5a4907ace4ac.tar.gz CMake-f3b8049884354e166249f40c15df5a4907ace4ac.tar.bz2 | |
Merge topic 'fix-INCLUDE_DIRECTORIES-multiconfig'
2a6bd96 Fix config-specific INCLUDE_DIRECTORIES in multi-config generators
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 95c6807..30d8f18 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1947,7 +1947,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target, BuildObjectListOrString dirs(this, this->XcodeVersion >= 30); BuildObjectListOrString fdirs(this, this->XcodeVersion >= 30); std::vector<std::string> includes; - this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt); + this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, + "C", configName); std::set<cmStdString> emitted; emitted.insert("/System/Library/Frameworks"); for(std::vector<std::string>::iterator i = includes.begin(); |