|
51 | 51 | VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}} |
52 | 52 | VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}} |
53 | 53 | VCPKG_OVERLAY_PORTS: "${{github.workspace}}/${{matrix.VCPKG_OVERLAY_PORTS}}" |
54 | | - VCPKG_MANIFEST_FEATURES: "freerdp;vnc;wol" |
| 54 | + VCPKG_MANIFEST_FEATURES: "freerdp;vnc" |
55 | 55 | CMAKE_GENERATOR: "Visual Studio 17 2022" |
56 | 56 | CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}} |
57 | 57 | qt_modules: ${{matrix.qt_modules}} |
@@ -108,6 +108,8 @@ jobs: |
108 | 108 | C:\msys64\usr\bin\unzip -d ${{env.INSTALL_DIR}}\npcap npcap-sdk-1.13.zip |
109 | 109 | ) |
110 | 110 |
|
| 111 | + # 因为 vcpkg 中 PcapPlusPlus 依赖 winpcap , winpcap 不能在 windows 10 上工作, |
| 112 | + # 所以编译依赖于 npcap |
111 | 113 | - name: build PcapPlusPlus |
112 | 114 | working-directory: ${{env.SOURCE_DIR}} |
113 | 115 | run: | |
@@ -361,15 +363,16 @@ jobs: |
361 | 363 | -DRABBIT_ENABLE_INSTALL_DEPENDENT=OFF ^ |
362 | 364 | -DRABBIT_ENABLE_INSTALL_QT=ON ^ |
363 | 365 | -DRABBIT_ENABLE_INSTALL_TO_BUILD_PATH=OFF ^ |
| 366 | + -DBUILD_FREERDP=ON ^ |
364 | 367 | -DLibVNCServer_DIR="${{env.INSTALL_DIR}}/lib/cmake/LibVNCServer" ^ |
365 | 368 | -DRabbitVNC_DIR=${{env.INSTALL_DIR}}/lib/cmake/RabbitVNC ^ |
366 | 369 | -Dtigervnc_DIR=${{env.INSTALL_DIR}}/lib/cmake/tigervnc ^ |
367 | 370 | -DQXmpp_DIR=${{env.INSTALL_DIR}}/lib/cmake/qxmpp ^ |
368 | 371 | -DQtService_DIR=${{env.INSTALL_DIR}}/lib/cmake/QtService ^ |
| 372 | + -DQtService_DIR=${{env.INSTALL_DIR}}/lib/cmake/QtService ^ |
369 | 373 | -DPcapPlusPlus_DIR=${{env.INSTALL_DIR}}/lib/cmake/pcapplusplus ^ |
370 | 374 | -DPCAP_ROOT=${{env.INSTALL_DIR}}/npcap ^ |
371 | | - -DPacket_ROOT=${{env.INSTALL_DIR}}/npcap ^ |
372 | | - -DBUILD_FREERDP=ON |
| 375 | + -DPacket_ROOT=${{env.INSTALL_DIR}}/npcap |
373 | 376 | cmake --build . --config ${{matrix.BUILD_TYPE}} |
374 | 377 | IF "${{matrix.BUILD_TYPE}}" == "Release" ( |
375 | 378 | echo "cmake install config: ${{matrix.BUILD_TYPE}} component: DependLibraries" |
|
0 commit comments