From 83b14167978167bf59301de007ac8f8b30da9259 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Thu, 28 Dec 2023 18:05:49 +0100 Subject: [PATCH] build: Fixed dependencies of plugins not being bundled correctly --- cmake/build_helpers.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index 316597487..6cec6ab0e 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -180,12 +180,17 @@ macro(createPackage) # Install binaries directly in the prefix, usually C:\Program Files\ImHex. set(CMAKE_INSTALL_BINDIR ".") + set(PLUGIN_TARGET_FILES "") + foreach (plugin IN LISTS PLUGINS) + list(APPEND PLUGIN_TARGET_FILES "$") + endforeach () + # Grab all dynamically linked dependencies. - INSTALL(CODE "set(CMAKE_INSTALL_BINDIR \"${CMAKE_INSTALL_BINDIR}\")") - INSTALL(CODE "LIST(APPEND DEP_FOLDERS \${PY_PARENT})") + install(CODE "set(CMAKE_INSTALL_BINDIR \"${CMAKE_INSTALL_BINDIR}\")") + install(CODE "set(PLUGIN_TARGET_FILES \"${PLUGIN_TARGET_FILES}\")") install(CODE [[ file(GET_RUNTIME_DEPENDENCIES - EXECUTABLES $ $ $ + EXECUTABLES ${PLUGIN_TARGET_FILES} $ $ RESOLVED_DEPENDENCIES_VAR _r_deps UNRESOLVED_DEPENDENCIES_VAR _u_deps CONFLICTING_DEPENDENCIES_PREFIX _c_deps