diff options
| author | Danny Parker <danny@ninjakiwi.com> | 2021-05-03 14:10:05 (GMT) |
|---|---|---|
| committer | Danny Parker <danny@ninjakiwi.com> | 2021-05-05 13:38:33 (GMT) |
| commit | dfaf55fbfd72e9706461592933df8686067b0e5f (patch) | |
| tree | a499d6a83ebcc1deec5013c83a483d41670adbb2 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 4df3f5300a13827336ca5329b53834cf0fb63a7d (diff) | |
| download | CMake-dfaf55fbfd72e9706461592933df8686067b0e5f.zip CMake-dfaf55fbfd72e9706461592933df8686067b0e5f.tar.gz CMake-dfaf55fbfd72e9706461592933df8686067b0e5f.tar.bz2 | |
Xcode: add extra '$(inherited)' entries using InheritBuildSettingAttribute.
These have been added to:
GCC_PREPROCESSOR_DEFINITIONS
OTHER_CFLAGS
OTHER_LDFLAGS
This is to allow Cocoapods to work correctly as it uses xcconfig files to alter build settings in Xcode, and requires these build settings to inherit from their parent, not overwrite.
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index d6909c3..3ed5ee3 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -4318,6 +4318,9 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects( this->InheritBuildSettingAttribute(t, "SYSTEM_FRAMEWORK_SEARCH_PATHS"); this->InheritBuildSettingAttribute(t, "LIBRARY_SEARCH_PATHS"); this->InheritBuildSettingAttribute(t, "LD_RUNPATH_SEARCH_PATHS"); + this->InheritBuildSettingAttribute(t, "GCC_PREPROCESSOR_DEFINITIONS"); + this->InheritBuildSettingAttribute(t, "OTHER_CFLAGS"); + this->InheritBuildSettingAttribute(t, "OTHER_LDFLAGS"); } if (this->XcodeBuildSystem == BuildSystem::One) { |