From cd910fe714e76875d9e9f07c2c0504264625afac Mon Sep 17 00:00:00 2001 From: toshi0383 Date: Sun, 29 Oct 2017 08:32:28 +0900 Subject: [PATCH] remove values before loading buildSettings from user spec --- Sources/XcodeGenKit/SettingsBuilder.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Sources/XcodeGenKit/SettingsBuilder.swift b/Sources/XcodeGenKit/SettingsBuilder.swift index 2bdd1a8a..1836fc66 100644 --- a/Sources/XcodeGenKit/SettingsBuilder.swift +++ b/Sources/XcodeGenKit/SettingsBuilder.swift @@ -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 }