diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2023-06-08 17:22:39 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2023-06-09 11:26:20 +0000 |
| commit | ed386f5524f3b75a1246e7ad43e3cd62f9eaeb51 (patch) | |
| tree | ca4b25da39f121ebe627b1af1f6ef0167fd4029d /cmake | |
| parent | f1e6155db58a4a5b4f65b20298965e93ab68332a (diff) | |
Add explicit dependency on thirdparty_sync_headers target
Add the dependency on thirdparty_sync_headers target for gn targets.
gn expects 3rdparty libraries like freetype or harfbuzz are in sync
and replicate the initial structure from the bundled sources.
We need to make sure that _sync_headers targets of 3rdparty libraries
are executed before runing any gn tasks.
Task-number: QTBUG-113416
Pick-to: 6.6 6.5
Change-Id: Ica77e2a0a04c63906515dddd76dfb8d0868602e6
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Functions.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index b90447ed3..e79811346 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -1276,6 +1276,9 @@ function(add_gn_command) ${arg_BUILDDIR}/${targetConfigFileName} ) add_dependencies(run_${arg_MODULE}_GnDone runGn_${arg_GN_TARGET}) + if(TARGET thirdparty_sync_headers) + add_dependencies(runGn_${arg_GN_TARGET} thirdparty_sync_headers) + endif() create_gn_target_config(${arg_GN_TARGET} ${arg_BUILDDIR}/${targetConfigFileName}) endfunction() |