Merge pull request #616 from mxcl/xcode-define-fix

ddunbar · web-flow · commit cb3ab81287c0 · 2016-08-25T16:15:34.000-07:00
Define SWIFT_PACKAGE in generated Xcode projects
diff --git a/Sources/Xcodeproj/Module+PBXProj.swift b/Sources/Xcodeproj/Module+PBXProj.swift
@@ -288,6 +288,9 @@ extension Module  {
         // At the moment, set the Swift version to 3 (we will need to make this dynamic), but for now this is necessary.
         buildSettings["SWIFT_VERSION"] = "3.0"
         
+        // Defined for regular `swift build` instantiations, so also should be defined here.
+        buildSettings["SWIFT_ACTIVE_COMPILATION_CONDITIONS"] = "SWIFT_PACKAGE"
+
         return buildSettings
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,9 @@ extension Module {`
`288`	`288`	`// At the moment, set the Swift version to 3 (we will need to make this dynamic), but for now this is necessary.`
`289`	`289`	`buildSettings["SWIFT_VERSION"] = "3.0"`
`290`	`290`
	`291`	+ // Defined for regular `swift build` instantiations, so also should be defined here.
	`292`	`+ buildSettings["SWIFT_ACTIVE_COMPILATION_CONDITIONS"] = "SWIFT_PACKAGE"`
	`293`	`+`
`291`	`294`	`return buildSettings`
`292`	`295`	`}`
`293`	`296`	`}`