diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-09-21 15:51:40 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2020-09-21 14:51:15 +0000 |
| commit | 3b6ef98d7ac079a906b07483e92540f2ff9485a3 (patch) | |
| tree | fa7c9db0940ebd952154dbe6997fba33cc5327c5 /cmake | |
| parent | 5f198584e206cb8ab85d0474ce19d0faabce9468 (diff) | |
headersclean: Fix include paths for dependent modules
Having ${QT_BUILD_DIR}/include as include path is not enough for
modules outside of qtbase. They also need to pick up headers from e.g.
Qt Core, which are available only in "${CMAKE_INSTALL_PREFIX}/include"
This amends db21bad936a761f475145886f1e06dfcfa11eb80
Fixes: QTBUG-82615
Change-Id: Ib003a66ce039bf1ab6e21a3b1cd86923207eb3db
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtHeadersClean.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmake/QtHeadersClean.cmake b/cmake/QtHeadersClean.cmake index e3e432a89f..e420e5814e 100644 --- a/cmake/QtHeadersClean.cmake +++ b/cmake/QtHeadersClean.cmake @@ -91,7 +91,8 @@ function(qt_internal_add_headers_clean_target OUTPUT "${artifact_path}" COMMENT "headersclean: Checking header ${header}" COMMAND "${CMAKE_CXX_COMPILER}" -c ${CMAKE_CXX_FLAGS} ${hcleanFLAGS} - -I "${QT_BUILD_DIR}/include" ${hcleanDEFS} -xc++ "${input_path}" + -I "${QT_BUILD_DIR}/include" -I "${CMAKE_INSTALL_PREFIX}/include" + ${hcleanDEFS} -xc++ "${input_path}" -o${artifact_path} IMPLICIT_DEPENDS CXX VERBATIM) @@ -115,7 +116,8 @@ function(qt_internal_add_headers_clean_target OUTPUT "${artifact_path}" COMMENT "headersclean: Checking header ${header}" COMMAND "${CMAKE_CXX_COMPILER}" -nologo -c ${CMAKE_CXX_FLAGS} ${hcleanFLAGS} - -I "${QT_BUILD_DIR}/include" ${hcleanDEFS} -FI "${input_path}" + -I "${QT_BUILD_DIR}/include" -I "${CMAKE_INSTALL_PREFIX}/include" + ${hcleanDEFS} -FI "${input_path}" -Fo${artifact_path} "${source_path}" IMPLICIT_DEPENDS CXX VERBATIM) |