fix windows build

.github/workflows/build-windows.yml

@@ -182,14 +182,16 @@ jobs:
 
       - name: Configure CMake
         run: |
-          cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$Qt6_DIR"
+          cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$Qt6_DIR" -DNO_DEPLOY=""
 
       - name: Build with CMake
         run: cmake --build build --config Release
 
       - name: Install & CPack
         working-directory: build
+        shell: bash
         run: |
+          export PATH="$PATH:/c/Users/runneradmin/.dotnet/tools"
           cmake --install .
           cpack .
 

CMakeLists.txt

@@ -190,6 +190,7 @@ add_subdirectory(lib/ipatool-go)
 add_subdirectory(lib/zupdater)
 
 if (WIN32) 
+    set(NO_DEPLOY_WIN_IFUSE ON) 
     add_subdirectory(lib/win-ifuse)
 endif()
 
@@ -320,6 +321,8 @@ if(WIN32 AND NOT DEFINED NO_DEPLOY)
             -DMSYS2_BIN_PATH=C:/msys64/mingw64/bin
             -DOUTPUT_DIR=$<TARGET_FILE_DIR:iDescriptor>
             -DQML_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/qml
+            -DPROJECT_SOURCE_DIR=${CMAKE_SOURCE_DIR}
+            -DWIN_IFUSE=$<TARGET_FILE:win-ifuse>
             -P ${CMAKE_CURRENT_LIST_DIR}/cmake/win-deploy.cmake
         COMMENT "Deploying Windows application with all dependencies"
         VERBATIM
@@ -351,6 +354,8 @@ if(WIN32)
                 -DMSYS2_BIN_PATH=\"C:/msys64/mingw64/bin\"
                 -DOUTPUT_DIR=\"\${CMAKE_INSTALL_PREFIX}\"
                 -DQML_SOURCE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/qml\"
+                -DPROJECT_SOURCE_DIR=\"${CMAKE_SOURCE_DIR}\"
+                -DWIN_IFUSE=$<TARGET_FILE:win-ifuse>
                 -P \"${CMAKE_CURRENT_LIST_DIR}/cmake/win-deploy.cmake\"
         )
     ")
@@ -394,13 +399,3 @@ endif()
 
 include(CPack)
 
-
-# FIXME: move to win-deploy.cmake
-if(WIN32)
-    add_custom_command(TARGET iDescriptor POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy
-            $<TARGET_FILE:win-ifuse>
-            $<TARGET_FILE_DIR:iDescriptor>
-    COMMENT "Copying win-ifuse executable to output directory"
-    )
-endif()

cmake/win-deploy.cmake

@@ -9,6 +9,7 @@ string(REPLACE "\"" "" MSYS2_BIN_PATH "${MSYS2_BIN_PATH}")
 if(QML_SOURCE_DIR)
     string(REPLACE "\"" "" QML_SOURCE_DIR "${QML_SOURCE_DIR}")
 endif()
+string(REPLACE "\"" "" PROJECT_SOURCE_DIR "${PROJECT_SOURCE_DIR}")
 
 message("=== Starting Windows deployment for: ${EXECUTABLE_PATH} ===")
 message("Debug info:")
@@ -233,9 +234,11 @@ message("Copying executables")
 file(COPY C:/msys64/mingw64/bin/iproxy.exe DESTINATION ${OUTPUT_DIR})
 
 message("Copying required scripts")
-file(COPY "${CMAKE_SOURCE_DIR}/install-apple-drivers.ps1" DESTINATION ${OUTPUT_DIR})
+file(COPY "${PROJECT_SOURCE_DIR}/install-apple-drivers.ps1" DESTINATION ${OUTPUT_DIR})
-file(COPY "${CMAKE_SOURCE_DIR}/install-win-fsp.silent.bat" DESTINATION ${OUTPUT_DIR})
+file(COPY "${PROJECT_SOURCE_DIR}/install-win-fsp.silent.bat" DESTINATION ${OUTPUT_DIR})
 
+message("Copying win-ifuse executable")
+file(COPY "${WIN_IFUSE}" DESTINATION ${OUTPUT_DIR})
 
 message("Copying winfsp-x64.dll")
 file(COPY "C:/Program Files (x86)/WinFsp/bin/winfsp-x64.dll" DESTINATION ${OUTPUT_DIR})