From fb807f436d59ddffb9caba09fcef0e74480a5362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Sun, 7 Aug 2022 15:46:01 +0200 Subject: [PATCH] cmake: Use file instead of qt_configure_file for generating plugin pri Matches qt_generate_module_pri_file and allows using genexes in the content of the file. Change-Id: I5ee7a973d3e27a721e31315d3ebe2c88ffa1db42 Reviewed-by: Alexandru Croitor --- cmake/QtPriHelpers.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index e1a9a7b2289..cf474177372 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -625,14 +625,15 @@ function(qt_generate_plugin_pri_file target) qt_path_join(pri_target_path ${QT_BUILD_DIR} ${INSTALL_MKSPECSDIR}/modules) qt_path_join(pri_file "${pri_target_path}" "qt_plugin_${plugin_name}.pri") - qt_configure_file(OUTPUT "${pri_file}" - CONTENT "QT_PLUGIN.${plugin_name}.TYPE = ${qmake_plugin_type} + + set(content "QT_PLUGIN.${plugin_name}.TYPE = ${qmake_plugin_type} QT_PLUGIN.${plugin_name}.EXTENDS = ${plugin_extends} QT_PLUGIN.${plugin_name}.DEPENDS = ${plugin_deps} QT_PLUGIN.${plugin_name}.CLASS_NAME = ${plugin_class_name} QT_PLUGIN.${plugin_name}.module_config = ${module_config} -QT_PLUGINS += ${plugin_name} -") +QT_PLUGINS += ${plugin_name}" +) + file(GENERATE OUTPUT "${pri_file}" CONTENT "${content}") qt_install(FILES "${pri_file}" DESTINATION "${INSTALL_MKSPECSDIR}/modules") endfunction()