diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2016-11-23 20:08:09 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-25 09:15:33 +0000 |
| commit | 2fab4a04938a4ddc30f9bdb1749e75e26a3df354 (patch) | |
| tree | 20ffd5d85f3f851c88beb2652f68f9e9291190b5 /src/core/gn_run.pro | |
| parent | c2447a308882ba3691d66b2c28df197f571518c7 (diff) | |
Add gn build of qtwebengine for linux
This commit uses gn instead of gyp to build on desktop
linux.
Use WEBENGINE_CONFIG+=use_gn to use gn during the build
instead of gyp.
Change-Id: Ifd3d8d0835b47c323a8d39c320eb55e5e1024dee
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/gn_run.pro')
| -rw-r--r-- | src/core/gn_run.pro | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro index c379f9510..5bb90d8b6 100644 --- a/src/core/gn_run.pro +++ b/src/core/gn_run.pro @@ -7,8 +7,14 @@ TEMPLATE = aux build_pass|!debug_and_release { + linux: include(config/desktop_linux.pri) + isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.) + ninja_binary = ninja + gn_binary = gn + runninja.target = run_ninja + rungn.target = run_gn !qtConfig(system-ninja) { ninja_binary = $$shell_quote($$shell_path($$ninjaPath())) @@ -18,18 +24,35 @@ build_pass|!debug_and_release { runninja.depends = buildninja } + CONFIG(release, debug|release): + gn_args += is_debug=false + + gn_args += "qtwebengine_target=\"$$shell_path($$OUT_PWD/$$getConfigDir()):QtWebEngineCore\"" + !qtConfig(system-gn) { + gn_binary = $$shell_quote($$shell_path($$gnPath())) buildgn.target = build_gn - buildgn.commands = $$buildGn() - !qtConfig(system-ninja): buildgn.depends = buildninja + buildgn.commands = $$buildGn($$gn_args) + !qtConfig(system-ninja) { + buildgn.depends = buildninja + rungn.depends = buildninja + } QMAKE_EXTRA_TARGETS += buildgn - runninja.depends = buildgn } - runninja.commands = $$ninja_binary \$\(NINJAFLAGS\) -C $$shell_quote($$OUT_PWD/$$getConfigDir()) + gn_args = $$shell_quote($$gn_args) + gn_src_root = $$shell_quote($$shell_path($$QTWEBENGINE_ROOT/$$getChromiumSrcDir())) + gn_build_root = $$shell_quote($$shell_path($$OUT_PWD/$$getConfigDir())) + rungn.commands = $$gn_binary gen $$gn_build_root --args=$$gn_args --root=$$gn_src_root + QMAKE_EXTRA_TARGETS += rungn + + runninja.commands = $$ninja_binary \$\(NINJAFLAGS\) -v -C $$shell_quote($$OUT_PWD/$$getConfigDir()) QtWebEngineCore + runninja.depends += rungn QMAKE_EXTRA_TARGETS += runninja - default_target.depends = buildgn + build_pass:build_all: default_target.target = all + else: default_target.target = first + default_target.depends = runninja QMAKE_EXTRA_TARGETS += default_target } else { |