flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-21 04:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bugs in config.pri

Browse Source
This commit is contained in:
Mat Sutcliffe
2018-12-21 02:32:35 +00:00
parent 23a597c2bc
commit 9f7e5bba5a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mkspecs/features/config.pri
View File

@@ -11,13 +11,12 @@ defineTest(copyJsonFromTo) {
to = $$2 to = $$2
options = $$3 options = $$3
unset($${to}._KEYS_)
for(key, $${from}._KEYS_) { for(key, $${from}._KEYS_) {
$${to}._KEYS_ += $$key $${to}._KEYS_ *= $$key
export($${to}._KEYS_) export($${to}._KEYS_)
copyJsonFromTo($${from}.$$key, $${to}.$$key, $$options) copyJsonFromTo($${from}.$$key, $${to}.$$key, $$options)
} }
contains(options, cache):defined($${to}._KEYS_, var): cache($${to}._KEYS_) contains(options, cache):defined($${from}._KEYS_, var): cache($${to}._KEYS_)
defined($$from, var) { defined($$from, var) {
contains(options, overwrite)|!defined($$to, var) { contains(options, overwrite)|!defined($$to, var) {
@@ -39,7 +38,9 @@ for(jsonFile, SWIFT_CONFIG_JSON) {
jsonPath = $$SourceRoot/$$jsonFile jsonPath = $$SourceRoot/$$jsonFile
!exists($$jsonPath): error($$jsonPath not found) !exists($$jsonPath): error($$jsonPath not found)
SWIFT_CONFIG_JSON_PATHS += $$jsonPath SWIFT_CONFIG_JSON_PATHS += $$jsonPath
SWIFT_CONFIG_JSON_SHELL_PATHS += $$shell_path($$jsonPath)
export(SWIFT_CONFIG_JSON_PATHS) export(SWIFT_CONFIG_JSON_PATHS)
export(SWIFT_CONFIG_JSON_SHELL_PATHS)
swiftNoCacheConfig { swiftNoCacheConfig {
message(Parsing $${jsonFile}...) message(Parsing $${jsonFile}...)
jsonBlob = $$cat($$jsonPath, blob) jsonBlob = $$cat($$jsonPath, blob)
@@ -62,7 +63,7 @@ QMAKE_INTERNAL_INCLUDED_FILES *= $$SWIFT_CONFIG_JSON_PATHS
load(touch) load(touch)
system($$TOUCH $$system_path($$BuildRoot/swift_config.cookie)) { system($$TOUCH $$system_path($$BuildRoot/swift_config.cookie)) {
swift_config_changed.target = $$shell_path($$BuildRoot/swift_config.cookie) swift_config_changed.target = $$shell_path($$BuildRoot/swift_config.cookie)
swift_config_changed.depends = $$shell_path($$SWIFT_CONFIG_JSON_PATHS) swift_config_changed.depends = $$SWIFT_CONFIG_JSON_SHELL_PATHS
swift_config_changed.commands = @echo ERROR: swift config changed, please run qmake again >&2 && exit 1 swift_config_changed.commands = @echo ERROR: swift config changed, please run qmake again >&2 && exit 1
QMAKE_EXTRA_TARGETS += swift_config_changed QMAKE_EXTRA_TARGETS += swift_config_changed
PRE_TARGETDEPS += $${swift_config_changed.target} PRE_TARGETDEPS += $${swift_config_changed.target}