diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 15:47:53 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 15:06:10 +0000 |
| commit | 1e27ad1697187549151657ba187928e439300db7 (patch) | |
| tree | 52f2e9c9611edd0f9a609dcb66ba24234cf04ee8 | |
| parent | 71190238298c6dd17f8841678d3a058c3008fe20 (diff) | |
Don't include header directories that don't exist
If a module is marked as NO_MODULE_HEADERS, we shouldn't
try to include the non-existing include directory which is
usually generated by syncqt.
Note it seems that NO_SYNC_QT and NO_MODULE_HEADERS seems
to converge, so it might make sense to merge them in the future.
Change-Id: Iab4e2907ed68776632337b37496b015535da8784
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | cmake/QtBuild.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 49ebc82b1b..14ca81bfc7 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1404,7 +1404,7 @@ function(add_qt_module target) # Handle cases like QmlDevTools which do not have their own headers, but rather borrow them # from another module. - if(NOT arg_NO_SYNC_QT) + if(NOT arg_NO_SYNC_QT AND NOT arg_NO_MODULE_HEADERS) list(APPEND private_includes "$<BUILD_INTERFACE:${module_include_dir}/${PROJECT_VERSION}>" "$<BUILD_INTERFACE:${module_include_dir}/${PROJECT_VERSION}/${module}>") |