diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-05-11 09:29:22 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-05-25 07:08:49 +0000 |
| commit | b7526e39ba9fd0ac51417348b8f2b5d07013c46c (patch) | |
| tree | e6ee6fb2fb05323fca4dcfd45be3895c8dd26b7d | |
| parent | 91f7a12fded004b74271878cf80235e669acbdb1 (diff) | |
| download | qtrepotools-b7526e39ba9fd0ac51417348b8f2b5d07013c46c.tar.gz | |
qt6_tool: Add a config key for free configure arguments
Change-Id: I545effbfc570cd0e2a1e425951da325791d6bbd8
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rwxr-xr-x | bin/qt6_tool | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/bin/qt6_tool b/bin/qt6_tool index c0f3a44..e47a90d 100755 --- a/bin/qt6_tool +++ b/bin/qt6_tool @@ -3,7 +3,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the build tools of Qt. @@ -66,22 +66,23 @@ in the format key=value: "%CONFIGFILE%" Configuration keys: -Acceleration Incredibuild or unset -BuildType CMake Build type -CMake CMake binary -DeveloperBuild (boolean) Developer build -DisabledFeatures Disabled CMake features -Features CMake features -Examples (boolean) whether to build examples -Generator CMake generator, defaults to Ninja -Mkspec Qt make spec (e.g. win32-g++) -GerritUser Gerrit user -InitArguments ,-separated list of arguments to init-repository -Jobs Number of jobs to be run simultaneously -Modules ,-separated list of modules to build ("all": all modules, - ("wall": all modules except qtwebengine [default]). -Static Build statically -Tests (boolean) whether to build tests +Acceleration Incredibuild or unset +BuildType CMake Build type +CMake CMake binary +ConfigureArguments Configure arguments +DeveloperBuild (boolean) Developer build +DisabledFeatures Disabled CMake features +Features CMake features +Examples (boolean) whether to build examples +Generator CMake generator, defaults to Ninja +Mkspec Qt make spec (e.g. win32-g++) +GerritUser Gerrit user +InitArguments ,-separated list of arguments to init-repository +Jobs Number of jobs to be run simultaneously +Modules ,-separated list of modules to build ("all": all modules, + ("wall": all modules except qtwebengine [default]). +Static Build statically +Tests (boolean) whether to build tests It is possible to use repository-specific values by adding a suffix preceded by a dash, eg: @@ -150,6 +151,7 @@ ACCELERATION_KEY = 'Acceleration' BUILD_EXAMPLES_KEY = 'Examples' BUILD_TESTS_KEY = 'Tests' BUILD_TYPE_KEY = 'BuildType' +CONFIGURE_ARGUMENTS_KEY = 'ConfigureArguments' CMAKE_KEY = 'CMake' DEVELOPER_BUILD_KEY = 'DeveloperBuild' DISABLED_FEATURES_KEY = 'DisabledFeatures' @@ -593,6 +595,7 @@ def configure_arguments(): build_examples = read_bool_config(BUILD_EXAMPLES_KEY) build_tests = read_bool_config(BUILD_TESTS_KEY) build_statically = read_bool_config(STATIC_KEY) + arguments = read_config(CONFIGURE_ARGUMENTS_KEY) mkspec = read_config(MKSPEC_KEY) result = [cmake(), f'-DCMAKE_INSTALL_PREFIX={install_dir}', @@ -617,6 +620,10 @@ def configure_arguments(): if build_type: result.append(f'-DCMAKE_BUILD_TYPE={build_type}') + + if arguments: + result.extend(arguments.split()) + return result |