Collect the correct QT dlls on Windows

Author: Paulchen-Panther

cmake/windows/BundleWindows.cmake.in

@@ -7,20 +7,29 @@ set(CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@")
 set(CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@")
 
 # Set windeployqt args
-set(ARGS --dry-run --no-opengl-sw --list mapping)
+set(QT5_ARGS)
 if(@QT_VERSION_MAJOR@ EQUAL 5)
-	set(EXTRA_ARGS --no-angle)
+	set(QT5_ARGS --no-angle)
+endif()
+
+find_file(QT_PATHS "qtpaths.bat" PATHS @CMAKE_PREFIX_PATH@ PATH_SUFFIXES bin)
+if(QT_PATHS)
+	set(QT_PATHS --qtpaths=${QT_PATHS})
+else()
+	set(QT_PATHS "")
 endif()
 
 if(EXISTS @CMAKE_BINARY_DIR@/bin/@PROJECT_NAME@@CMAKE_EXECUTABLE_SUFFIX@)
 	# Collect the runtime libraries
-	get_filename_component(QT_BIN_DIR "${QMAKE_EXECUTABLE}" DIRECTORY)
 	execute_process(
-		COMMAND "${CMAKE_COMMAND}" -E env "PATH=${QT_BIN_DIR}" "@WINDEPLOYQT_EXECUTABLE@"
-		${ARGS}
-		${EXTRA_ARGS}
+		COMMAND "${CMAKE_COMMAND}" -E env "PATH=@QT_BIN_DIR@" "@WINDEPLOYQT_EXECUTABLE@"
+		${QT_PATHS}
+		--dry-run
+		--no-opengl-sw
+		${QT5_ARGS}
+		--list mapping
 		"@CMAKE_BINARY_DIR@/bin/@PROJECT_NAME@@CMAKE_EXECUTABLE_SUFFIX@"
-		WORKING_DIRECTORY "${QT_BIN_DIR}/.."
+		WORKING_DIRECTORY "@QT_BIN_DIR@/.."
 		OUTPUT_VARIABLE DEPS
 		OUTPUT_STRIP_TRAILING_WHITESPACE
 	)

src/hyperiond/CMakeLists.txt

@@ -16,8 +16,8 @@ if(WIN32)
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
 
 	# Search for windeployqt target (qt6 has the target natively) otherwise create it.
+	get_filename_component(QT_BIN_DIR ${QMAKE_EXECUTABLE} DIRECTORY)
 	if(NOT TARGET Qt${QT_VERSION_MAJOR}::windeployqt)
-		get_filename_component(QT_BIN_DIR ${QMAKE_EXECUTABLE} DIRECTORY)
 		find_program(WINDEPLOYQT_EXECUTABLE NAMES windeployqt HINTS ${QT_BIN_DIR})
 		if(EXISTS ${WINDEPLOYQT_EXECUTABLE})
 			add_executable(Qt${QT_VERSION_MAJOR}::windeployqt IMPORTED)
@@ -190,6 +190,13 @@ endif()
 if(WIN32 AND NOT DEFINED ENV{GITHUB_ACTIONS})
 	if(TARGET Qt${QT_VERSION_MAJOR}::windeployqt)
 		set(WINDEPLOYQT_PARAMS --verbose 0 --no-compiler-runtime --no-opengl-sw --no-system-d3d-compiler)
+
+		get_target_property(QT_QTPATHS_EXECUTABLE Qt${QT_VERSION_MAJOR}::qtpaths IMPORTED_LOCATION)
+		find_file(QT_PATHS "qtpaths.bat" PATHS ${CMAKE_PREFIX_PATH} PATH_SUFFIXES bin)
+		if(QT_PATHS)
+			list(APPEND WINDEPLOYQT_PARAMS "--qtpaths=${QT_PATHS}")
+		endif()
+
 		add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
 			COMMAND Qt${QT_VERSION_MAJOR}::windeployqt ${WINDEPLOYQT_PARAMS} "$<TARGET_FILE:${PROJECT_NAME}>"
 		)