Skip to content

Commit

Permalink
Link ${target}_lib_pri directly to INTERFACE_LIBRARY targets
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
semlanik committed Dec 1, 2022
1 parent ada76ac commit 190e58e
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions cmake/QtPriHelpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -542,11 +542,7 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
-P "${QT_CMAKE_DIR}/QtGenerateLibPri.cmake"
VERBATIM)
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)
endif()
add_dependencies(${target} ${target}_lib_pri)
endif()

qt_install(FILES "${pri_files}" DESTINATION ${INSTALL_MKSPECSDIR}/modules)
Expand Down

0 comments on commit 190e58e

Please sign in to comment.