diff options
author | Michal Klocek <michal.klocek@qt.io> | 2023-03-29 14:20:33 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2023-04-05 08:55:55 +0200 |
commit | 4c9f9e4d305cd9a8e4e123d25cc6d8ecbc0990ad (patch) | |
tree | 111774122cc479340cb9daac4337063a562d5b34 /src | |
parent | f7e37c7189c50d32e89d2a445ab9b2bc9ab4a24d (diff) | |
download | qtwebengine-4c9f9e4d305cd9a8e4e123d25cc6d8ecbc0990ad.tar.gz |
Require gn for generating docs
Make sure gn is build before doc target, otherwise
parallel top level build might not succeed.
As configure runs the gn binary is not compiled
so use scripting mode to execute gn call during
build time.
Task-number: QTBUG-88482
Fixes: QTBUG-112644
Change-Id: I7e851de90e2a3ec52f5259d51f677b23d8245bcb
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
(cherry picked from commit e368689df5566462ceea28c06803f9a0abf91cc5)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/api/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/pdf/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt index f452656d3..922adfd8c 100644 --- a/src/core/api/CMakeLists.txt +++ b/src/core/api/CMakeLists.txt @@ -94,6 +94,7 @@ add_code_attributions_target( ENTRY_TEMPLATE ../doc/about_credits_entry.tmpl BUILDDIR ${buildDir}/${config}/${arch} ) +add_dependencies(generate_chromium_attributions run_core_GnDone) add_dependencies(docs generate_chromium_attributions) ## diff --git a/src/pdf/CMakeLists.txt b/src/pdf/CMakeLists.txt index d7aea23cd..0a039cdd1 100644 --- a/src/pdf/CMakeLists.txt +++ b/src/pdf/CMakeLists.txt @@ -63,6 +63,7 @@ add_code_attributions_target( ENTRY_TEMPLATE doc/about_credits_entry.tmpl BUILDDIR ${buildDir}/${config}/${arch} ) +add_dependencies(generate_pdf_attributions run_pdf_GnDone) add_dependencies(docs generate_pdf_attributions) ## |