From 190e58e1f4eb9e9bf12a9561cf32cdccdc0b22e0 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 24 Nov 2022 12:55:39 +0100 Subject: [PATCH] Link ${target}_lib_pri directly to INTERFACE_LIBRARY targets 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 --- cmake/QtPriHelpers.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index d86c056dba9..77b41d56276 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -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)