fix workflow run

Author: DSVVA

.github/workflows/msbuild.yml

@@ -0,0 +1,78 @@
+name: Windows Build
+
+on:
+  push:
+    branches: [ "main" ]
+    tags: ["v*"]
+  pull_request:
+    branches: [ "main" ]
+  workflow_dispatch:
+
+env:
+  BUILD_CONFIGURATION: Release
+  INSTALL_DIR: ${{ github.workspace }}\install
+  ZIP_NAME: MHY_Scanner_${{ github.ref_name }}.zip
+
+permissions:
+  contents: write
+  actions: write
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Qt6
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: '6.8.0'
+          host: 'windows'
+          target: 'desktop'
+          arch: 'win64_msvc2022_64'
+          cache: true
+
+      - name: Setup vcpkg 
+        uses: lukka/run-vcpkg@v11
+
+      - name: Configure CMake 
+        run: |
+          cmake -B build `
+          -DCMAKE_BUILD_TYPE=${{ env.BUILD_CONFIGURATION }} `
+          -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}\scripts\buildsystems\vcpkg.cmake `
+          -DVCPKG_TARGET_TRIPLET=x64-windows-static-md `
+          -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}\install `
+          -DUNIT_TESTS=OFF `
+          -DDEV=OFF
+      
+      - name: Build 
+        run: |
+          cmake --build build --config ${{ env.BUILD_CONFIGURATION }} --parallel
+      
+      - name: Install
+        run: |
+          cmake --install build --config ${{ env.BUILD_CONFIGURATION }}
+        
+      - name: Create ZIP
+        run: |
+          powershell Compress-Archive -Path "${{ env.INSTALL_DIR }}\*" -DestinationPath "${{ github.workspace }}\${{ env.ZIP_NAME }}"
+        
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.ZIP_NAME }}
+          path: ${{ github.workspace }}\${{ env.ZIP_NAME }}
+          retention-days: 5
+
+      - name: Create GitHub Release
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: softprops/action-gh-release@v2
+        with:
+          name: ${{ github.ref_name }}
+          files: ${{ github.workspace }}\${{ env.ZIP_NAME }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/windows-build.yml

@@ -24,11 +24,10 @@ if(MSVC)
 		add_link_options(/DEBUG /OPT:REF,ICF,LBR)
 	endif()
 endif()
-	
+
 include(FetchContent)
 include(ExternalProject)
 
-include(cmake/install_nuget.cmake)
 include(cmake/install_ffmpeg.cmake)
 include(cmake/build_QR-Code-generator.cmake)
 
@@ -39,6 +38,8 @@ FetchContent_Declare(
 )
 FetchContent_MakeAvailable(nlohmann_json)
 
+find_package(unofficial-webview2 CONFIG REQUIRED)
+
 find_package(cpr CONFIG REQUIRED)
 
 find_package(OpenCV REQUIRED opencv_world)
@@ -122,7 +123,7 @@ set(PROJECT_LIBRARIES
 
 	cpr::cpr
 	QR_Code_generator
-	WebView2LoaderStatic
+	unofficial::webview2::webview2
 	nlohmann_json::nlohmann_json
 	${OpenCV_LIBS}
 	${FFMPEG_LIBS}
@@ -131,7 +132,7 @@ set(PROJECT_LIBRARIES
 
 target_link_libraries(${PROJECT_NAME} PRIVATE ${PROJECT_LIBRARIES})
 
-file(GLOB FFMPEG_DLLS
+file(GLOB FFMPEG_DLL_FILES
 	"${FFMPEG_BIN_DIR}/avcodec-*.dll"
 	"${FFMPEG_BIN_DIR}/avformat-*.dll"
 	"${FFMPEG_BIN_DIR}/avutil-*.dll"
@@ -141,7 +142,7 @@ file(GLOB FFMPEG_DLLS
 
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
 	COMMAND ${CMAKE_COMMAND} -E copy_if_different
-	${FFMPEG_DLLS}
+	${FFMPEG_DLL_FILES}
 	"$<TARGET_FILE_DIR:${PROJECT_NAME}>"
 )
 
@@ -159,38 +160,37 @@ endif()
 # install
 set(Install_Directory "${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}_${PROJECT_VERSION}")
 
-install(TARGETS ${PROJECT_NAME}
-	RUNTIME DESTINATION ${Install_Directory}
-)
+install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${Install_Directory})
+
+install(FILES $<TARGET_PDB_FILE:${PROJECT_NAME}> DESTINATION ${Install_Directory})
 
 set(QT_DLL_FILES
-	"${QT6_INSTALL_PREFIX}/bin/Qt6Core.dll"
-	"${QT6_INSTALL_PREFIX}/bin/Qt6Widgets.dll"
-	"${QT6_INSTALL_PREFIX}/bin/Qt6Gui.dll"
+	${QT6_INSTALL_PREFIX}/bin/Qt6Core.dll
+	${QT6_INSTALL_PREFIX}/bin/Qt6Widgets.dll
+	${QT6_INSTALL_PREFIX}/bin/Qt6Gui.dll
 )
 
 install(
 	FILES 
-	${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pdb
 	${QT_DLL_FILES}
-	${FFMPEG_DLLS}
+	${FFMPEG_DLL_FILES}
 	DESTINATION 
 	${Install_Directory}
 )
 
 install(
 	FILES
-	"${QT6_INSTALL_PREFIX}/plugins/platforms/qdirect2d.dll"
-	"${QT6_INSTALL_PREFIX}/plugins/platforms/qminimal.dll"
-	"${QT6_INSTALL_PREFIX}/plugins/platforms/qoffscreen.dll"
-	"${QT6_INSTALL_PREFIX}/plugins/platforms/qwindows.dll"
+	${QT6_INSTALL_PREFIX}/plugins/platforms/qdirect2d.dll
+	${QT6_INSTALL_PREFIX}/plugins/platforms/qminimal.dll
+	${QT6_INSTALL_PREFIX}/plugins/platforms/qoffscreen.dll
+	${QT6_INSTALL_PREFIX}/plugins/platforms/qwindows.dll
 	DESTINATION
-	"${Install_Directory}/plugins/platforms"
+	${Install_Directory}/plugins/platforms
 )
 
 install(
 	FILES
-	"${QT6_INSTALL_PREFIX}/plugins/styles/qmodernwindowsstyle.dll"
+	${QT6_INSTALL_PREFIX}/plugins/styles/qmodernwindowsstyle.dll
 	DESTINATION
 	${Install_Directory}/plugins/styles
 )

CMakeLists.txt

@@ -1,4 +1,4 @@
-{
+{
 	"name": "mhy-scanner",
 	"version": "1.1.14",
 	"builtin-baseline": "57987637aac17d62bac535bc839baca3754490e6",
@@ -12,6 +12,9 @@
 		},
 		{
 			"name": "openssl"
+		},
+		{
+			"name": "webview2"
 		}
 	]
 }