diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-26 15:53:32 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-26 19:13:45 +0000 |
| commit | 80ab9a3b6e8ba704e14a6ffa04d8f78870b56b59 (patch) | |
| tree | c733704d7a520e63b4f62b52adfed06c7aaec586 /build_scripts | |
| parent | 23c1001c79af9cbb3cd2d8a301e2e315b1f833b2 (diff) | |
setup.py: Make ninja the default generator
It is recommended for use with Qt 6.
As a drive by, fix invalid parameter in error message.
Change-Id: I7d01a2b70b9033fa827f34fffece0368c1a5462a
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'build_scripts')
| -rw-r--r-- | build_scripts/options.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_scripts/options.py b/build_scripts/options.py index eb5d438a0..2f648fb57 100644 --- a/build_scripts/options.py +++ b/build_scripts/options.py @@ -47,7 +47,7 @@ import warnings from .qtinfo import QtInfo -_AVAILABLE_MKSPECS = ["msvc", "mingw", "ninja"] if sys.platform == "win32" else ["make", "ninja"] +_AVAILABLE_MKSPECS = ["ninja", "msvc", "mingw"] if sys.platform == "win32" else ["ninja", "make"] # Global options not which are not part of the commands @@ -329,7 +329,7 @@ class DistUtilsCommandMixin(object): if not self.make_spec: self.make_spec = _AVAILABLE_MKSPECS[0] if self.make_spec not in _AVAILABLE_MKSPECS: - print('Invalid option --make-spec "{}". Available values are {}'.format(OPTION["MAKESPEC"], + print('Invalid option --make-spec "{}". Available values are {}'.format(self.make_spec, _AVAILABLE_MKSPECS)) return False |