Skip to content
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

Update vcpkg to 2024.02.14 #27

Merged
merged 6 commits into from
Mar 19, 2024
Merged

Update vcpkg to 2024.02.14 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c959483
Update vcpkg to 2024.02.14
patricia-gallardo Mar 18, 2024
12fdf40
Show vcpkg logs
patricia-gallardo Mar 19, 2024
86e31f4
Show vcpkg logs
patricia-gallardo Mar 19, 2024
754a94a
Add in the SFML log
patricia-gallardo Mar 19, 2024
ab6782a
Add libxcursor-dev to the dependencies
patricia-gallardo Mar 19, 2024
2785131
Add libxcursor-dev to the dependencies for the cmake workflow aswell
patricia-gallardo Mar 19, 2024
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
9 changes: 8 additions & 1 deletion .github/workflows/clang-tidy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,19 @@ jobs:
- name: Install Build dependencies
run: |
sudo apt update -y
sudo apt-get install -y libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev libudev-dev make ninja-build cmake
sudo apt-get install -y libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev libudev-dev libxcursor-dev make ninja-build cmake

- name: Configure CMake
working-directory: build
run: cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..

- name: Show vcpkg logs
if: always()
shell: bash
run: |
cat /home/runner/work/ms-pacman/ms-pacman/build/vcpkg-manifest-install.log
cat /home/runner/work/ms-pacman/ms-pacman/build/_deps/vcpkg-src/buildtrees/sfml/install-x64-linux-dbg-out.log

- name: Run clang-tidy-13
working-directory: build
run: run-clang-tidy-13
2 changes: 1 addition & 1 deletion .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:

- name: Install Linux dependencies
if: startsWith( matrix.configurations.os, 'ubuntu-' )
run: sudo apt-get update && sudo apt-get install -y libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev libudev-dev clang-12 make ninja-build cmake autoconf libtool mesa-common-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev
run: sudo apt-get update && sudo apt-get install -y libx11-dev libxcursor-dev libxi-dev libxrandr-dev libgl1-mesa-dev libudev-dev clang-12 make ninja-build cmake autoconf libtool mesa-common-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev

- name: Install Additional Linux dependencies
if: matrix.configurations.config-preset == 'linux-gcc-11'
Expand Down
2 changes: 1 addition & 1 deletion cmake/vcpkg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(FetchContent)
FetchContent_Declare(
vcpkg
GIT_REPOSITORY https://github.com/microsoft/vcpkg
GIT_TAG 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1 # 2023.04.15
GIT_TAG fba75d09065fcc76a25dcf386b1d00d33f5175af # 2024.02.14
)

if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
"name": "ms-pacman",
"version": "1.0",
"builtin-baseline": "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1",
"builtin-baseline": "fba75d09065fcc76a25dcf386b1d00d33f5175af",
"dependencies": [
"sfml",
"fmt",
Expand Down
Loading