Skip to content

[linux] add libxkbcommon library dependency to the vcpkg build #6811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AenBleidd wants to merge 1 commit into from
Closed

[linux] add libxkbcommon library dependency to the vcpkg build #6811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linux-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
- name: Install dependencies
run: |
apt-get update
apt-get install -y autopoint make build-essential m4 pkg-config autoconf autoconf-archive libtool git python3 python3-distutils python3-jinja2 python3-venv curl zip unzip tar bison p7zip-full dbus
apt-get install -y autopoint make build-essential m4 pkg-config autoconf autoconf-archive libtool git python3 python3-distutils python3-jinja2 python3-venv curl zip unzip tar bison p7zip-full dbus flex

- name: Install dependencies for arm64
if: matrix.arch == 'arm64'
Expand Down
8 changes: 7 additions & 1 deletion 3rdParty/vcpkg_ports/configs/manager/linux/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
},
"libnotify",
"xcb-util",
"pixbufloader-svg"
"pixbufloader-svg",
"libxkbcommon",
{
"name": "wayland-protocols",
"features": ["force-build"],
"default-features": false
}
]
}
1 change: 1 addition & 0 deletions 3rdParty/vcpkg_ports/triplets/ci/arm-linux-release.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../vcpkg_root_find.cmake)
include(${VCPKG_ROOT}/triplets/community/arm-linux-release.cmake)

set(X_VCPKG_FORCE_VCPKG_X_LIBRARIES ON)
set(X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES ON)

if(PORT STREQUAL "dbus")
if(NOT $ENV{TMPDIR} STREQUAL "")
Expand Down
1 change: 1 addition & 0 deletions 3rdParty/vcpkg_ports/triplets/ci/arm64-linux-release.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../vcpkg_root_find.cmake)
include(${VCPKG_ROOT}/triplets/community/arm64-linux-release.cmake)

set(X_VCPKG_FORCE_VCPKG_X_LIBRARIES ON)
set(X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES ON)

if(PORT STREQUAL "dbus")
if(NOT $ENV{TMPDIR} STREQUAL "")
Expand Down
1 change: 1 addition & 0 deletions 3rdParty/vcpkg_ports/triplets/ci/snap-linux-amd64.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../vcpkg_root_find.cmake)
include(${VCPKG_ROOT}/triplets/community/x64-linux-release.cmake)

set(X_VCPKG_FORCE_VCPKG_X_LIBRARIES ON)
set(X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES ON)
1 change: 1 addition & 0 deletions 3rdParty/vcpkg_ports/triplets/ci/snap-linux-arm64.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../vcpkg_root_find.cmake)
include(${VCPKG_ROOT}/triplets/community/arm64-linux-release.cmake)

set(X_VCPKG_FORCE_VCPKG_X_LIBRARIES ON)
set(X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES ON)

if(PORT STREQUAL "dbus")
if(NOT $ENV{TMPDIR} STREQUAL "")
Expand Down
1 change: 1 addition & 0 deletions 3rdParty/vcpkg_ports/triplets/ci/x64-linux.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../vcpkg_root_find.cmake)
include(${VCPKG_ROOT}/triplets/x64-linux.cmake)

set(X_VCPKG_FORCE_VCPKG_X_LIBRARIES ON)
set(X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES ON)
set(VCPKG_BUILD_TYPE release)
1 change: 1 addition & 0 deletions snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ parts:
- cmake
- dbus
- python3-venv
- flex
source: .
plugin: autotools
build-environment:
Expand Down
Loading