Skip to content

[Xcodeproj] Add $(inherited) to OTHER_SWIFT_FLAGS #2193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2019
Merged

[Xcodeproj] Add $(inherited) to OTHER_SWIFT_FLAGS #2193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 Sources/Xcodeproj/generate().swift → Sources/Xcodeproj/generate.swift
View file
Open in desktop
File renamed without changes.
9 changes: 5 additions & 4 deletions Sources/Xcodeproj/pbxproj().swift → Sources/Xcodeproj/pbxproj.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ func xcodeProject(
// paths so that all the products can be found.
projectSettings.common.DYLIB_INSTALL_NAME_BASE = "@rpath"

// Set the `Xcode` build preset in Swift to let code conditionalize on
// being built in Xcode.
projectSettings.common.OTHER_SWIFT_FLAGS = ["$(inherited)", "-DXcode"]

// Add any additional compiler and linker flags the user has specified.
if !options.flags.cCompilerFlags.isEmpty {
projectSettings.common.OTHER_CFLAGS = options.flags.cCompilerFlags
Expand All @@ -134,12 +138,9 @@ func xcodeProject(
projectSettings.common.OTHER_LDFLAGS = options.flags.linkerFlags
}
if !options.flags.swiftCompilerFlags.isEmpty {
projectSettings.common.OTHER_SWIFT_FLAGS = options.flags.swiftCompilerFlags
projectSettings.common.OTHER_SWIFT_FLAGS += options.flags.swiftCompilerFlags
}

// Also set the `Xcode` build preset in Swift to let code conditionalize on
// being built in Xcode.
projectSettings.common.OTHER_SWIFT_FLAGS += ["-DXcode"]
projectSettings.common.MACOSX_DEPLOYMENT_TARGET = "10.10"

// Prevent Xcode project upgrade warnings.
Expand Down