diff options
| author | Ross Kilgariff <ross@ninjakiwi.com> | 2023-01-25 19:37:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-01-25 20:15:03 (GMT) |
| commit | 01c1d81527aec261445fa533d5f92ca473f77160 (patch) | |
| tree | 7368616a49310767abfd634ee749a8e55239ad0d /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 950effe434623b50a1c85e2c53ed592210e79ceb (diff) | |
| download | CMake-01c1d81527aec261445fa533d5f92ca473f77160.zip CMake-01c1d81527aec261445fa533d5f92ca473f77160.tar.gz CMake-01c1d81527aec261445fa533d5f92ca473f77160.tar.bz2 | |
Xcode: Inherit Swift flags and compilation conditions
Extend the change from commit dfaf55fbfd (Xcode: add extra
'$(inherited)' entries using InheritBuildSettingAttribute, 2021-05-03,
v3.21.0-rc1~182^2) to cover Swift flags and compilation conditions,
allowing CocoaPods and CMake to interoperate when used in the same
project.
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 5f28fc6..8e6e706 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -4536,6 +4536,9 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects( this->InheritBuildSettingAttribute(t, "GCC_PREPROCESSOR_DEFINITIONS"); this->InheritBuildSettingAttribute(t, "OTHER_CFLAGS"); this->InheritBuildSettingAttribute(t, "OTHER_LDFLAGS"); + this->InheritBuildSettingAttribute(t, "OTHER_SWIFT_FLAGS"); + this->InheritBuildSettingAttribute(t, + "SWIFT_ACTIVE_COMPILATION_CONDITIONS"); } if (this->XcodeBuildSystem == BuildSystem::One) { |