s

Author: firewave

.github/workflows/CI-windows.yml

@@ -61,8 +61,6 @@ jobs:
       - name: Deploy GUI
         run: |
           windeployqt build\bin\Debug || exit /b !errorlevel!
-          del build\bin\Debug\cppcheck-gui.ilk || exit /b !errorlevel!
-          del build\bin\Debug\cppcheck-gui.pdb || exit /b !errorlevel!
 
       # TODO: run GUI tests
 
@@ -71,3 +69,4 @@ jobs:
           rem TODO: the Qt DLLs are not being installed
           cmake --build build --config Debug --target install
           rem TODO: validate the installed files
+          rem TODO: the structure does not match an actual Windows installation

cmake/findDependencies.cmake

@@ -26,6 +26,18 @@ if(BUILD_GUI)
             find_program(QHELPGENERATOR qhelpgenerator HINTS ${_qt_bin_dir} REQUIRED)
         endif()
     endif()
+
+    if(MSVC)
+        find_program(WINDEPLOYQT windeployqt)
+        if(NOT WINDEPLOYQT)
+            # TODO: how to properly get the Qt binary folder?
+            # piggy-back off Qt::qmake for now as it should be in the same folder as the binary we are looking for
+            get_target_property(_qmake_executable Qt::qmake IMPORTED_LOCATION)
+            get_filename_component(_qt_bin_dir ${_qmake_executable} DIRECTORY)
+            message(STATUS "windeployqt not found in PATH - trying ${_qt_bin_dir}")
+            find_program(WINDEPLOYQT windeployqt HINTS ${_qt_bin_dir} REQUIRED)
+        endif()
+    endif()
 endif()
 
 if(HAVE_RULES)

gui/CMakeLists.txt

@@ -71,6 +71,12 @@ CheckOptions:
         add_dependencies(cppcheck-gui online-help.qhc)
     endif()
 
+    if(MSVC)
+        message(STATUS "CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}")
+        add_custom_target(windeployqt ${WINDEPLOYQT} ${CMAKE_BINARY_DIR})
+        add_dependencies(windeployqt cppcheck-gui)
+    endif()
+
     install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
     install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)