From 8cea61e14d8425c7842b5fa85ca1883aca0df63c Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 30 Oct 2018 15:25:53 +0100 Subject: [PATCH] QtPostProcess: Fix generation of *Depends header files Normalize Qt module names before trying to match them. Deduplicate the names while at it. Change-Id: I5821c34fe5904cf9e9b986ac3ae4af2b248466b7 Reviewed-by: Simon Hausmann --- cmake/QtPostProcess.cmake | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/cmake/QtPostProcess.cmake b/cmake/QtPostProcess.cmake index 5e563d4c915..48de9ef3964 100644 --- a/cmake/QtPostProcess.cmake +++ b/cmake/QtPostProcess.cmake @@ -9,7 +9,7 @@ function(qt_internal_write_depends_file target) endforeach() string(APPEND contents "#endif\n") - file(GENERATE OUTPUT ${outfile} CONTENT ${contents}) + file(GENERATE OUTPUT "${outfile}" CONTENT "${contents}") endfunction() function(qt_internal_create_depends_files) @@ -17,11 +17,24 @@ function(qt_internal_create_depends_files) foreach (target ${KNOWN_QT_MODULES}) get_target_property(depends "${target}" LINK_LIBRARIES) foreach (dep ${depends}) + # Normalize module by stripping leading "Qt::" and trailing "Private" + if (dep MATCHES "Qt::(.*)") + set(dep "${CMAKE_MATCH_1}") + endif() + if (dep MATCHES "(.*)Private") + set(dep "${CMAKE_MATCH_1}") + endif() + list(FIND KNOWN_QT_MODULES "${dep}" _pos) if (_pos GREATER -1) list(APPEND qtdeps "${dep}") endif() endforeach() + + if (DEFINED qtdeps) + list(REMOVE_DUPLICATES qtdeps) + endif() + get_target_property(hasModuleHeaders "${target}" MODULE_HAS_HEADERS) if (${hasModuleHeaders}) qt_internal_write_depends_file("${target}" ${qtdeps})