diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-04-01 18:36:12 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-04-02 10:00:20 +0200 |
| commit | 6fdeaea24f9035ad53ba2548a9467b3264cf01ad (patch) | |
| tree | c07bfdd3b260f1376c022e469bb4b512944fed9b /cmake | |
| parent | 84a7f0d3d71fb5a2fefa3d99cd91448bb06cf391 (diff) | |
CMake: Don't try to add 3rd party includes to ModuleDepends files
When creating the include/QtShaderTools/QtShaderToolsDepends file
in QtPostProcess.cmake -> qt_internal_write_depends_file(),
we decide which include files to append based on link dependencies
starting with Qt::, which happens to match 3rd party targets like
Qt::BundledSpirv_Cross which doesn't expose headers in the
prefix/include dir.
Mark all bundled targets with the QT_MODULE_SKIP_DEPENDS_INCLUDE
property to exclude them from being added to Depends files.
This should fix static builds of qtquick3d which includes
<QtShaderTools/QtShaderToolsDepend> which tries to include a
non-existent <QtBundledSpirv_Cross/QtBundledSpirv_Cross>.
Change-Id: I9dcff1e2ab721a7c21fcff3fda0faf8d023d60ba
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index f2d81575c4..51ad1f899d 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -3104,6 +3104,7 @@ function(qt_add_3rdparty_library target) VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR} QT_MODULE_IS_3RDPARTY_LIBRARY TRUE + QT_MODULE_SKIP_DEPENDS_INCLUDE TRUE ) qt_handle_multi_config_output_dirs("${target}") |