Skip to content

[alsa] Fix multiple find_package(ALSA REQUIRED) #43008

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

Merged
BillyONeal merged 4 commits into from
Jan 2, 2025
Merged

[alsa] Fix multiple find_package(ALSA REQUIRED) #43008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c97b4cc
[alsa] Fix multiple find_package(ALSA REQUIRED)
dg0yt Dec 30, 2024
558e52b
[cmake-user] Test ALSA
dg0yt Dec 30, 2024
fcbece0
Merge branch 'microsoft:master' into alsa
dg0yt Dec 31, 2024
49103f7
Merge branch 'cmake-user' into alsa
dg0yt Jan 2, 2025
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
5 changes: 1 addition & 4 deletions ports/alsa/vcpkg-cmake-wrapper.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ find_library(
include(SelectLibraryConfigurations)
select_library_configurations(ALSA)
unset(ALSA_FOUND)

if(NOT ALSA_INCLUDE_DIR OR NOT ALSA_LIBRARY)
message(FATAL_ERROR "Broken installation of the alsa vcpkg port")
endif()
set(ALSA_LIBRARY "${ALSA_LIBRARY}" CACHE INTERNAL "")

_find_package(${ARGS})

Expand Down
1 change: 1 addition & 0 deletions ports/alsa/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "alsa",
"version": "1.2.13",
"port-version": 1,
"description": "The Advanced Linux Sound Architecture (ALSA) - library",
"homepage": "https://www.alsa-project.org/",
"license": "LGPL-2.1-or-later",
Expand Down
5 changes: 5 additions & 0 deletions scripts/test_ports/cmake-user/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
"find-package": {
"description": "Ports to be tested via find_package($package)",
"dependencies": [
{
"$package": "ALSA",
"name": "alsa",
"platform": "linux"
},
{
"$package": "Boost",
"name": "boost",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/alsa.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c80dafc2416d968c6f9060a12de375b70457fb57",
"version": "1.2.13",
"port-version": 1
},
{
"git-tree": "5dd0d76c964da48ce085c9a66ad00463c0607916",
"version": "1.2.13",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
},
"alsa": {
"baseline": "1.2.13",
"port-version": 0
"port-version": 1
},
"amd-adl-sdk": {
"baseline": "17.1",
Expand Down