summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2022-11-24 12:55:39 +0100
committerAlexey Edelev <alexey.edelev@qt.io>2022-12-05 16:01:55 +0100
commitc47e857ac362e7c915ed4afeb9d219fe3b9126c4 (patch)
treed0155e7080f2e7819501583cd10854638491b147 /cmake
parent5ef6a158c77d1b597d52b0e57434d5e0760275a2 (diff)
downloadqtbase-c47e857ac362e7c915ed4afeb9d219fe3b9126c4.tar.gz
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. Fixes: QTBUG-108815 Change-Id: I0e170d3e0e42d342881beb8aca1cc5a764425826 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 190e58e1f4eb9e9bf12a9561cf32cdccdc0b22e0)
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtPriHelpers.cmake6
1 files changed, 1 insertions, 5 deletions
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
index 71164c6718..75eb209c98 100644
--- a/cmake/QtPriHelpers.cmake
+++ b/cmake/QtPriHelpers.cmake
@@ -533,11 +533,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(arg_HEADER_MODULE)
- add_dependencies(${target}_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)