1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Link ${target}_lib_pri directly to INTERFACE_LIBRARY targets

Browse Source 
There is no reason for adding dependency to the custom
'_pri_dep_timestamp' target instead of the INTERFACE_LIBRARY target
itself. This will close the chains of dependency between repo targets
and the HEADER_MODULE dependencies.

Pick-to: 6.4 6.2
Fixes: QTBUG-108815
Change-Id: I0e170d3e0e42d342881beb8aca1cc5a764425826
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2022-11-24 12:55:39 +01:00
parent ada76ac8b6
commit 190e58e1f4
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtPriHelpers.cmake
View File

@ -542,12 +542,8 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
-P "${QT_CMAKE_DIR}/QtGenerateLibPri.cmake" -P "${QT_CMAKE_DIR}/QtGenerateLibPri.cmake"
VERBATIM) VERBATIM)
add_custom_target(${target}_lib_pri DEPENDS "${private_pri_file_path}") add_custom_target(${target}_lib_pri DEPENDS "${private_pri_file_path}")
if(is_interface_lib)
add_dependencies(${target}_pri_dep_timestamp ${target}_lib_pri)
else()
add_dependencies(${target} ${target}_lib_pri) add_dependencies(${target} ${target}_lib_pri)
endif() endif()
endif()
qt_install(FILES "${pri_files}" DESTINATION ${INSTALL_MKSPECSDIR}/modules) qt_install(FILES "${pri_files}" DESTINATION ${INSTALL_MKSPECSDIR}/modules)
endfunction() endfunction()