summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-08-25 17:19:08 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2016-09-15 06:52:35 +0000
commit64cc947ded9999527197168f5d16f25a15638e58 (patch)
treef43d62e4771d2cdeaf8a08bd3d61a18202fc89c8 /configure.json
parent3e5229c689ca329db89b5af1afdc458688137db8 (diff)
automatically launch new configure system in top-level builds
this includes moving the -skip option here, where it belongs. the implementation is a bit hacky, but the proper one would be vastly more complex: we'd have to load all modules, then parse the command line properly (the -skip parsing would be a custom callback, to avoid needing to process features), then discard all now excluded modules again, then re-process the command line (so we can complain about options which are now invalid), and only now proceed with the actual feature processing. that seems a bit over the top, so we accept that -skip cannot be the argument of another option, which seems quite reasonable. Change-Id: I0053658e6d7e11b82cdfe55893cb553b664a9298 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json7
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.json b/configure.json
new file mode 100644
index 00000000..f437252f
--- /dev/null
+++ b/configure.json
@@ -0,0 +1,7 @@
+{
+ "commandline": {
+ "options": {
+ "skip": "addString"
+ }
+ }
+}