Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 15:49:36 +02:00
Code Issues Releases Wiki Activity

Fix Findid3tag.cmake

Browse Source 
Remove linking option containing erroneous reference to `z.lib`.
Add `set` commands to provide documented `id3tag::id3tag` vars.

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
Signed-off-by: Be <be@mixxx.org>
Co-authored-by: Emily Mabrey <emabrey@tenacityaudio.org>
Co-authored-by: Be <be@mixxx.org>
This commit is contained in:
Be 2021-08-16 21:36:50 -05:00 committed by Emily Mabrey
parent 43eeb00900
commit d54bcb0822
No known key found for this signature in database
GPG Key ID: 6F4EF47256A1B7DC
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmake-modules/Findid3tag.cmake
View File

@ -55,8 +55,13 @@ else()
DOC "id3tag library" DOC "id3tag library"
) )
find_package(ZLIB REQUIRED) if(NOT ZLIB_FOUND)
list(APPEND id3tag_LINK_LIBRARIES ZLIB::ZLIB) if(VCPKG)
set (ZLIB_ROOT ${env}/bin)
endif()
find_library(ZLIB REQUIRED)
endif()
endif() endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
@ -67,10 +72,20 @@ find_package_handle_standard_args(
id3tag_INCLUDEDIR id3tag_INCLUDEDIR
) )
# Remove default reference to link "z" since we already found it
if(ZLIB_FOUND AND NOT UNIX)
list(FILTER id3tag_LINK_LIBRARIES EXCLUDE REGEX "[z]")
list(APPEND id3tag_LINK_LIBRARIES ZLIB::ZLIB)
endif()
if(id3tag_FOUND) if(id3tag_FOUND)
set(id3tag_LIBRARIES "${id3tag_LIBRARY}")
set(id3tag_INCLUDE_DIRS "${id3tag_INCLUDE_DIR}")
set(id3tag_DEFINITIONS "${PC_id3tag_CFLAGS_OTHER}")
if(NOT TARGET id3tag::id3tag) if(NOT TARGET id3tag::id3tag)
add_library(id3tag::id3tag INTERFACE IMPORTED) add_library(id3tag::id3tag INTERFACE IMPORTED)
target_link_libraries(id3tag::id3tag INTERFACE "${id3tag_LINK_LIBRARIES}") target_link_libraries(id3tag::id3tag INTERFACE ${id3tag_LINK_LIBRARIES})
target_include_directories(id3tag::id3tag INTERFACE "${id3tag_INCLUDEDIR}") target_include_directories(id3tag::id3tag INTERFACE "${id3tag_INCLUDEDIR}")
endif() endif()
endif() endif()