Skip to content

Commit fdd5ad8

Browse files
committed
VCPKG: modify freerdp
1 parent dd8f884 commit fdd5ad8

4 files changed

Lines changed: 27 additions & 5 deletions

File tree

.github/workflows/android.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
5555
VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
5656
VCPKG_DEFAULT_HOST_TRIPLET: x64-linux
57-
VCPKG_MANIFEST_FEATURES: "freerdp;vnc;wol;filetransfer"
57+
VCPKG_MANIFEST_FEATURES: "freerdp;vnc;wol;filetransfer;${{matrix.VCPKG_MANIFEST_FEATURES}}"
5858
BUILD_DIR: ${{github.workspace}}/build
5959
SOURCE_DIR: ${{github.workspace}}/.cache/source
6060
TOOLS_DIR: ${{github.workspace}}/.cache/tools
@@ -437,6 +437,7 @@ jobs:
437437
-DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
438438
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
439439
-DVCPKG_TARGET_TRIPLET=${{env.VCPKG_TARGET_TRIPLET}} \
440+
-DVCPKG_MANIFEST_FEATURES="${{env.VCPKG_MANIFEST_FEATURES}}" \
440441
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
441442
-DVCPKG_VERBOSE=ON \
442443
-DRABBIT_ENABLE_INSTALL_DEPENDENT=ON \

.github/workflows/macos.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
VCPKGGITCOMMITID: 7213cf8135c329c37c7e2778e40774489a0583a8
5656
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
5757
VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
58-
VCPKG_MANIFEST_FEATURES: "freerdp;vnc;terminal;filetransfer"
58+
VCPKG_MANIFEST_FEATURES: "freerdp-server;vnc;terminal;filetransfer"
5959
artifact_name: build_macos
6060
RabbitRemoteControl_VERSION: v0.1.0-dev
6161

@@ -373,6 +373,7 @@ jobs:
373373
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
374374
-DVCPKG_VERBOSE=ON \
375375
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
376+
-DVCPKG_MANIFEST_FEATURES="${{env.VCPKG_MANIFEST_FEATURES}}" \
376377
-DRABBIT_WITH_MACDEPLOY=OFF \
377378
-DWITH_WebEngineWidgets=ON \
378379
-DBUILD_FREERDP=ON \

.github/workflows/msvc.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
6060
VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}}
6161
VCPKG_OVERLAY_PORTS: "${{github.workspace}}/${{matrix.VCPKG_OVERLAY_PORTS}}"
62-
VCPKG_MANIFEST_FEATURES: "freerdp;vnc;terminal;filetransfer;database"
62+
VCPKG_MANIFEST_FEATURES: "freerdp-server;vnc;terminal;filetransfer;database;${{matrix.VCPKG_MANIFEST_FEATURES}}"
6363
VCPKG_INSTALLED_DIR: ${{github.workspace}}\.cache\install
6464
CMAKE_GENERATOR: "Visual Studio 17 2022"
6565
CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}}
@@ -436,6 +436,7 @@ jobs:
436436
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON ^
437437
-DVCPKG_APPLOCAL_DEPS=ON ^
438438
-DVCPKG_TRACE_FIND_PACKAGE=ON ^
439+
-DVCPKG_MANIFEST_FEATURES="${{env.VCPKG_MANIFEST_FEATURES}}" ^
439440
-DENABLE_UPDATE_TRANSLATIONS=ON ^
440441
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 ^
441442
-DBUILD_APP=ON ^

vcpkg.json

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
],
1111

1212
"default-features": [
13-
"freerdp",
1413
"vnc",
1514
"filetransfer"
1615
],
@@ -51,7 +50,27 @@
5150
"freerdp": {
5251
"description": "freerdp",
5352
"dependencies": [
54-
"freerdp"
53+
{
54+
"name": "freerdp",
55+
"default-features": false,
56+
"features": [
57+
"client"
58+
]
59+
}
60+
]
61+
},
62+
63+
"freerdp-server": {
64+
"description": "freerdp server",
65+
"dependencies": [
66+
{
67+
"name": "freerdp",
68+
"default-features": false,
69+
"features": [
70+
"client",
71+
"server"
72+
]
73+
}
5574
]
5675
},
5776

0 commit comments

Comments
 (0)