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.

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

chore: Test CMake stuff #1

Closed
wants to merge 6 commits into from
Closed
Changes from 1 commit
Commits
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
Next Next commit
Base commits
Co-Authored-By: David Li <[email protected]>
RobbieNeko and randombk committed Jan 17, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 7afa03fb2ca01e944eb318db5ad58fceb0a9d0a7
5 changes: 0 additions & 5 deletions .github/workflows/manual-release.yml
Original file line number Diff line number Diff line change
@@ -202,11 +202,6 @@ jobs:
appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', '.github/vcpkg_triplets/**' ) }}-${{ matrix.arch }}-1
setupOnly: true
vcpkgDirectory: "${{ runner.workspace }}/b/vcpkg"
# We have to use at least this version of vcpkg to include fixes for
# various issues we've encountered over time. Keep it in sync with the builtin-baseline
# field in vcpkg.json. Caching happens as a post-action which runs at the end of
# the whole workflow, after vcpkg install happens during msbuild run.
vcpkgGitCommitId: "66444e13a86da7087ee24c342f91801cc6eb9877"
- name: Install dependencies (windows msvc) (3/3)
if: runner.os == 'Windows'
run: |
3 changes: 1 addition & 2 deletions .github/workflows/msvc-full-features-cmake.yml
Original file line number Diff line number Diff line change
@@ -75,11 +75,10 @@ jobs:
uses: lukka/get-cmake@latest

- name: Install vcpkg
uses: lukka/run-vcpkg@v11
uses: lukka/run-vcpkg@main
id: runvcpkg
with:
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
vcpkgGitCommitId: "66444e13a86da7087ee24c342f91801cc6eb9877"

- name: Integrate vcpkg
run: |
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -225,11 +225,10 @@ jobs:
uses: lukka/get-cmake@latest

- name: Install vcpkg
uses: lukka/run-vcpkg@v11
uses: lukka/run-vcpkg@main
id: runvcpkg
with:
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
vcpkgGitCommitId: "66444e13a86da7087ee24c342f91801cc6eb9877"

- name: Integrate vcpkg
if: runner.os == 'Windows'
32 changes: 12 additions & 20 deletions msvc-full-features/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
{
"name": "bn-vcpkg-dependencies",
"version-string": "experimental",
"dependencies": [
"sdl2",
{
"name": "sdl2-image",
"features": [ "libjpeg-turbo" ]
},
{
"name": "sdl2-mixer",
"features": [ "libflac", "mpg123", "libmodplug" ]
},
"sdl2-ttf"
],
"builtin-baseline": "c9aba300923c8ec0ab190e2bff23085209925c97",
"vcpkg-configuration": {
"overlay-ports": [
"../.github/vcpkg_ports"
]
}
"name": "bn-vcpkg-dependencies",
"version-string": "experimental",
"dependencies": [
"sdl2",
{ "name": "sdl2-image", "features": [ "libjpeg-turbo" ] },
{ "name": "sdl2-mixer", "features": [ "libflac", "mpg123", "libmodplug" ] },
"sdl2-ttf"
],
"builtin-baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f",
"vcpkg-configuration": {
"overlay-ports": [ "../.github/vcpkg_ports" ]
}
}

Unchanged files with check annotations Beta

find_package(SDL2_mixer)
if (NOT (SDL2_MIXER_FOUND OR TARGET SDL2_mixer::SDL2_mixer
OR TARGET SDL2_mixer::SDL2_mixer-static))
message(FATAL_ERROR

Check failure on line 381 in CMakeLists.txt

GitHub Actions / Build

You need the SDL2_mixer development library to be able to compile with
"You need the SDL2_mixer development library \
to be able to compile with sound enabled. \
See CMake compiling guide for details and more info.")