GitHub/XcodeGen
1
0
Fork 0
mirror of https://github.com/yonaskolb/XcodeGen.git synced 2026-03-18 20:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove values before loading buildSettings from user spec

Browse Source
This commit is contained in:
toshi0383
2017-10-29 08:32:28 +09:00
parent f68f96e249
commit cd910fe714
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/XcodeGenKit/SettingsBuilder.swift
+6 -2
View File
@@ -23,7 +23,6 @@ extension ProjectSpec {
buildSettings += SettingsPresetFile.config(type).getBuildSettings()
}
buildSettings += getBuildSettings(settings: settings, config: config)
if let configPath = configFiles[config.name] {
// Do not overwrite project xcconfig's value.
if let configFile = try? XCConfig(path: basePath + configPath) {
@@ -35,6 +34,8 @@ extension ProjectSpec {
}
}
buildSettings += getBuildSettings(settings: settings, config: config)
return buildSettings
}
@@ -46,7 +47,7 @@ extension ProjectSpec {
buildSettings += SettingsPresetFile.product(target.type).getBuildSettings()
buildSettings += SettingsPresetFile.productPlatform(target.type, target.platform).getBuildSettings()
}
buildSettings += getBuildSettings(settings: target.settings, config: config)
// Do not overwrite target xcconfig's values.
if let configPath = target.configFiles[config.name] {
if let configFile = try? XCConfig(path: basePath + configPath) {
@@ -67,6 +68,9 @@ extension ProjectSpec {
}
}
}
buildSettings += getBuildSettings(settings: target.settings, config: config)
return buildSettings
}