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

Jump to bottom

[mp3lame] Fix detection in cmake config #38480

Closed
wants to merge 2 commits into from
Closed

[mp3lame] Fix detection in cmake config #38480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddd4562
[mp3lame] Fix detection in cmake config
Neumann-A Apr 30, 2024
63e1328
v db
Neumann-A Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions ports/mp3lame/Config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ get_filename_component(_mp3lame_root "${_mp3lame_root}" PATH)
set(_mp3lame_rel_lib "${_mp3lame_root}/lib/@MP3LAME_LIB@")
set(_mp3lame_dbg_lib "${_mp3lame_root}/debug/lib/@MP3LAME_LIB@")

if (EXISTS "${_mp3lame_rel_lib}" OR EXISTS "${_mp3lame_dbg_lib}")
set(mp3lame_FOUND FALSE)

if (EXISTS "${_mp3lame_rel_lib}" OR EXISTS "${_mp3lame_dbg_lib}" AND NOT TARGET mp3lame::mp3lame)

add_library(mp3lame::mp3lame UNKNOWN IMPORTED)
set_target_properties(mp3lame::mp3lame
Expand Down Expand Up @@ -47,11 +49,10 @@ if (EXISTS "${_mp3lame_rel_lib}" OR EXISTS "${_mp3lame_dbg_lib}")

unset(_mp3lame_mpghip_rel_lib)
unset(_mp3lame_mpghip_dbg_lib)
endif()

else()

set(mp3lame_FOUND FALSE)

if(TARGET mp3lame::mp3lame)
set(mp3lame_FOUND TRUE)
endif()

unset(_mp3lame_rel_lib)
Expand Down
2 changes: 1 addition & 1 deletion ports/mp3lame/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mp3lame",
"version": "3.100",
"port-version": 12,
"port-version": 13,
"description": "LAME is a high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL.",
"homepage": "https://sourceforge.net/projects/lame",
"license": "LGPL-2.0-only",
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 @@ -5854,7 +5854,7 @@
},
"mp3lame": {
"baseline": "3.100",
"port-version": 12
"port-version": 13
},
"mpark-patterns": {
"baseline": "2019-10-03",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mp3lame.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c8eb821fa81b048621273034a62460902331551d",
"version": "3.100",
"port-version": 13
},
{
"git-tree": "af04a48e3995bd88563c0dab302c5c7793e09173",
"version": "3.100",
Expand Down