From c535c4dc5d936170f97867131b7e013b06ae2314 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Fri, 31 Jan 2020 15:05:36 +0100 Subject: [PATCH] CMake Build: Install qml module dependencies Change-Id: Id6fd1d14efb6e7b68ffc3f4e3196387cc9417ba0 Reviewed-by: Alessandro Portale --- src/QtCreatorDeployment.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/QtCreatorDeployment.cmake b/src/QtCreatorDeployment.cmake index 1eefbfdaf9f..9fb697af69b 100644 --- a/src/QtCreatorDeployment.cmake +++ b/src/QtCreatorDeployment.cmake @@ -86,12 +86,16 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16) get_filename_component(install_prefix \"\${CMAKE_INSTALL_PREFIX}\" ABSOLUTE) - # Get also the dependencies of Qt's plugins + # Get the dependencies of Qt's plugins foreach(plugin ${qt5_plugin_directories}) file(GLOB plugin_files \"\${install_prefix}/\${plugin}/*${CMAKE_SHARED_LIBRARY_SUFFIX}\") list(APPEND qt5_plugin_files \"\${plugin_files}\") endforeach() + # Get the qml module dependencies + file(GLOB_RECURSE qml_plugin_files \"\${install_prefix}/\${qt5_qml_dest_dir}/*/*${CMAKE_SHARED_LIBRARY_SUFFIX}\") + list(APPEND qt5_plugin_files \"\${qml_plugin_files}\") + set(installed_EXECUTABLES_NOT_PREFIXED \"${__QTC_INSTALLED_EXECUTABLES}\") set(installed_LIBRARIES_NOT_PREFIXED \"${__QTC_INSTALLED_LIBRARIES}\") set(installed_MODULES_NOT_PREFIXED \"${__QTC_INSTALLED_PLUGINS}\")