diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2016-11-18 19:42:07 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2016-12-16 17:00:44 +0000 |
| commit | e00ac03b406f7588a41b83f6d33a8306c3dd92b8 (patch) | |
| tree | c66ea729f77492fb0fb6c4312817d6abd54f7822 /src/core/core.pro | |
| parent | 794606237796b976f9cede7bfdc218e4de6a42ec (diff) | |
Add gn generator for pro files
Change-Id: I5f28314d79b4aad587b323b027eb6d74ad422a73
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/core.pro')
| -rw-r--r-- | src/core/core.pro | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/core/core.pro b/src/core/core.pro index 86fe838cb..e495685eb 100644 --- a/src/core/core.pro +++ b/src/core/core.pro @@ -9,26 +9,32 @@ core_api.file = api/core_api.pro core_module.file = core_module.pro core_module.depends = core_api -contains(WEBENGINE_CONFIG, use_gn) { +# core_generator.pro is a dummy .pro file that is used by qmake +# to generate our main .gyp/BUILD.gn file +core_generator.file = core_generator.pro +core_generator.depends = core_headers + + +use?(gn) { + gn_run.file = gn_run.pro - SUBDIRS += gn_run -} else { + gn_run.depends = core_generator - # core_gyp_generator.pro is a dummy .pro file that is used by qmake - # to generate our main .gyp file - core_gyp_generator.file = core_gyp_generator.pro - core_gyp_generator.depends = core_headers + SUBDIRS += gn_run \ + core_headers \ + core_generator +} else { # gyp_run.pro calls gyp through gyp_qtwebengine on the qmake step, and ninja on the make step. gyp_run.file = gyp_run.pro - gyp_run.depends = core_gyp_generator + gyp_run.depends = core_generator core_api.depends = gyp_run SUBDIRS += gyp_run \ core_api \ core_module \ core_headers \ - core_gyp_generator + core_generator !win32 { # gyp_configure_host.pro and gyp_configure_target.pro are phony pro files that |