diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-12-16 10:50:33 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-12-16 10:50:33 +0100 |
| commit | 85b60d96088a1893a8095eff99f0c5cf9dd7fd2f (patch) | |
| tree | 5b7b7a83361a1eb7d42d9314f86eacaca55da3da /scripts/build_plugin.py | |
| parent | 7c674e0a5b1cd795d04762f157e42d73a891b80e (diff) | |
| parent | 21c1d8fd60ba9aa47ef29b89a447093cc833e303 (diff) | |
Merge remote-tracking branch 'origin/6.0'
Conflicts:
src/plugins/coreplugin/editormanager/editormanager.cpp
Change-Id: I80fe565749ad5c06dfe99436f2dc6ab4b66a2537
Diffstat (limited to 'scripts/build_plugin.py')
| -rwxr-xr-x | scripts/build_plugin.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/build_plugin.py b/scripts/build_plugin.py index f54cf64fd8b..d3e9c7bb9e9 100755 --- a/scripts/build_plugin.py +++ b/scripts/build_plugin.py @@ -49,6 +49,8 @@ def get_arguments(): parser.add_argument('--output-path', help='Output path for resulting 7zip files') parser.add_argument('--add-path', help='Prepends a CMAKE_PREFIX_PATH to the build', action='append', dest='prefix_paths', default=[]) + parser.add_argument('--add-module-path', help='Prepends a CMAKE_MODULE_PATH to the build', + action='append', dest='module_paths', default=[]) parser.add_argument('--add-make-arg', help='Passes the argument to the make tool.', action='append', dest='make_args', default=[]) parser.add_argument('--add-config', help=('Adds the argument to the CMake configuration call. ' @@ -93,6 +95,10 @@ def build(args, paths): '-DCMAKE_INSTALL_PREFIX=' + common.to_posix_path(paths.install), '-G', 'Ninja'] + if args.module_paths: + module_paths = [common.to_posix_path(os.path.abspath(fp)) for fp in args.module_paths] + cmake_args += ['-DCMAKE_MODULE_PATH=' + ';'.join(module_paths)] + # force MSVC on Windows, because it looks for GCC in the PATH first, # even if MSVC is first mentioned in the PATH... # TODO would be nicer if we only did this if cl.exe is indeed first in the PATH |