diff options
author | Michal Klocek <michal.klocek@qt.io> | 2019-08-22 11:19:50 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-09-17 17:01:42 +0000 |
commit | 1de18504fa524a49dffe808164fe8f8187b4ffab (patch) | |
tree | 57857e885cc5f168a680ee21a9d014f9178c5500 /configure.pri | |
parent | f03cd06d89ceba2b99ffb9c4ca911dc01f0bdb08 (diff) |
Add platform and architecture to configure
Make configure system aware of platform and architecture
checks.
Task-number: QTBUG-75840
Task-number: QTBUG-76606
Change-Id: I8d2c9dd863ee2c4a3015ad8147f43dc788cfd72d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'configure.pri')
-rw-r--r-- | configure.pri | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri index eff7d8f61..0bf4ca41a 100644 --- a/configure.pri +++ b/configure.pri @@ -1,3 +1,5 @@ +load(platform) + include(src/buildtools/config/functions.pri) # this must be done outside any function @@ -35,6 +37,11 @@ defineTest(qtConfTest_detectJumboBuild) { return(true) } +defineTest(qtConfReport_skipBuildWarning) { + $${1}() + !isEmpty(skipBuildReason):qtConfAddWarning($${skipBuildReason}) +} + defineTest(qtConfReport_jumboBuild) { mergeLimit = $$eval(config.input.merge_limit) mergeLimit = $$find(mergeLimit, "\d") @@ -96,6 +103,21 @@ defineTest(qtConfTest_detectBison) { return(true) } +defineTest(qtConfTest_detectPlatform) { + !isPlatformSupported() { + qtLog("Platform not supported".) + return(false) + } + return(true) +} + +defineTest(qtConfTest_detectArch) { + !isArchSupported() { + qtLog("Architecture not supported".) + return(false) + } + return(true) +} defineTest(qtConfTest_detectFlex) { flex = $$qtConfFindGnuTool("flex$$EXE_SUFFIX") isEmpty(flex) { |