summaryrefslogtreecommitdiffstats
path: root/util/cmake/configurejson2cmake.py
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2020-06-26 20:45:11 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2020-06-29 12:47:59 +0200
commit943340222e841904707dc4f3e08f0df57d2e5c28 (patch)
treeddafe167749aeb63dfc7c806a5aabc9e5c50df21 /util/cmake/configurejson2cmake.py
parent8df4caf554e81e7de9e0154a15544426e99acbbc (diff)
CMake: Generate qdevice.pri when cross-building
This adds the CMake equivalent to the classical -device-option key=value configure argument: -DQT_QMAKE_DEVICE_OPTIONS=key1=value1[;keyN=valueN] The keys and values get dumped verbatim into qdevice.pri. This patch also ports the machineTuple configure test. Its result is written into qdevice.pri as value for the GCC_MACHINE_DUMP variable. Change-Id: I29f2323fd87639fafaed99ec7446c7ee75504705 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'util/cmake/configurejson2cmake.py')
-rwxr-xr-xutil/cmake/configurejson2cmake.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index b9ce8aa1ae..970b87e30e 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -819,6 +819,15 @@ def parseTest(ctx, test, data, cm_fh):
cm_fh.write(f'qt_config_compile_test_x86simd({test} "{label}")\n')
cm_fh.write("\n")
+ elif data["type"] == "machineTuple":
+ knownTests.add(test)
+
+ label = data["label"]
+
+ cm_fh.write(f"# {test}\n")
+ cm_fh.write(f'qt_config_compile_test_machine_tuple("{label}")\n')
+ cm_fh.write("\n")
+
# "features": {
# "android-style-assets": {
# "label": "Android Style Assets",