From 238c291dfd57fe5f298a4e70a6724a7ec17de40e Mon Sep 17 00:00:00 2001
From: Edgar <Edgar@AnotherFoxGuy.com>
Date: Mon, 25 Sep 2023 15:36:08 +0200
Subject: [PATCH] :bug: Fixed FixupBundlePostBuild failing to find QT dlls

---
 .../PackageLibrariesForDeployment.cmake       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/cmake/macros/PackageLibrariesForDeployment.cmake b/cmake/macros/PackageLibrariesForDeployment.cmake
index 9f93bfe0a6..9554f2be9c 100644
--- a/cmake/macros/PackageLibrariesForDeployment.cmake
+++ b/cmake/macros/PackageLibrariesForDeployment.cmake
@@ -19,16 +19,6 @@ macro(PACKAGE_LIBRARIES_FOR_DEPLOYMENT)
 
     set(PLUGIN_PATH "plugins")
 
-    # add a post-build command to copy DLLs beside the executable
-    add_custom_command(
-      TARGET ${TARGET_NAME}
-      POST_BUILD
-      COMMAND ${CMAKE_COMMAND}
-        -DBUNDLE_EXECUTABLE="$<TARGET_FILE:${TARGET_NAME}>"
-        -DBUNDLE_PLUGIN_DIR="$<TARGET_FILE_DIR:${TARGET_NAME}>/${PLUGIN_PATH}"
-        -P "${CMAKE_CURRENT_BINARY_DIR}/FixupBundlePostBuild.cmake"
-    )
-
     get_target_property(Qt_Core_Location Qt5::Core LOCATION)
     get_filename_component(QT_BIN_DIR ${Qt_Core_Location} DIRECTORY)
     find_program(WINDEPLOYQT_COMMAND windeployqt PATHS QT_BIN_DIR)
@@ -46,6 +36,16 @@ macro(PACKAGE_LIBRARIES_FOR_DEPLOYMENT)
        --no-compiler-runtime --no-opengl-sw --no-angle -no-system-d3d-compiler \"$<TARGET_FILE:${TARGET_NAME}>\""
     )
 
+    # add a post-build command to copy DLLs beside the executable
+    add_custom_command(
+      TARGET ${TARGET_NAME}
+      POST_BUILD
+      COMMAND ${CMAKE_COMMAND}
+        -DBUNDLE_EXECUTABLE="$<TARGET_FILE:${TARGET_NAME}>"
+        -DBUNDLE_PLUGIN_DIR="$<TARGET_FILE_DIR:${TARGET_NAME}>/${PLUGIN_PATH}"
+        -P "${CMAKE_CURRENT_BINARY_DIR}/FixupBundlePostBuild.cmake"
+    )
+
     set(QTAUDIO_PATH "$<TARGET_FILE_DIR:${TARGET_NAME}>/audio")
     set(QTAUDIO_WIN7_PATH "$<TARGET_FILE_DIR:${TARGET_NAME}>/audioWin7/audio")
     set(QTAUDIO_WIN8_PATH "$<TARGET_FILE_DIR:${TARGET_NAME}>/audioWin8/audio")