diff options
| author | Brad King <brad.king@kitware.com> | 2023-01-26 14:15:48 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-01-26 14:15:57 (GMT) |
| commit | 6dca2dd86dfbbdb7199b88e7d34318b92c862b41 (patch) | |
| tree | 446399cc183d6745f69e0f5ec0cdf7b734f5be21 /Source | |
| parent | d693c35ea64046a38f32159b587ca685ad6ffc97 (diff) | |
| parent | 01c1d81527aec261445fa533d5f92ca473f77160 (diff) | |
| download | CMake-6dca2dd86dfbbdb7199b88e7d34318b92c862b41.zip CMake-6dca2dd86dfbbdb7199b88e7d34318b92c862b41.tar.gz CMake-6dca2dd86dfbbdb7199b88e7d34318b92c862b41.tar.bz2 | |
Merge topic 'xcode-swift-inherited-flags'
01c1d81527 Xcode: Inherit Swift flags and compilation conditions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8122
Diffstat (limited to 'Source')
| -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) { |