mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-05-25 12:10:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

GitHub Actions: Update Homebrew utfcpp to 4.0.2 (#1171)

Browse Source 
Revert "Fix build on Mac with Homebrew utf8cpp"
This reverts commit 70b4ce79fb.

Is now fixed upstream
https://github.com/nemtrif/utfcpp/pull/113
https://github.com/nemtrif/utfcpp/releases/tag/v4.0.2
https://github.com/Homebrew/homebrew-core/pull/153333
This commit is contained in:
Urs Fleisch 2023-11-05 14:39:33 +01:00 committed by GitHub
parent 70b4ce79fb
commit f202fa25c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -23,7 +23,9 @@ jobs:
if: matrix.os == 'ubuntu-latest'
- name: Set up macOS
run: brew install cppunit utf8cpp
run: |
brew update
brew install cppunit utf8cpp
if: matrix.os == 'macos-latest'
- name: Set up Windows

10
taglib/CMakeLists.txt
View File

@ -343,16 +343,6 @@ add_library(tag ${tag_LIB_SRCS} ${tag_HDRS})
target_link_libraries(tag $<$<TARGET_EXISTS:utf8::cpp>:utf8::cpp>)
target_link_libraries(tag $<$<TARGET_EXISTS:ZLIB::ZLIB>:ZLIB::ZLIB>)
# Homebrew utf8cpp 4.0.1 seems to have issues. utf8.h is not found because
# imported target utf8::cpp does not exist. The imported target utf8cpp::utf8cpp
# includes non-existent path /usr/local/include/utf8cpp and cannot be used.
# Therefore the following (temporary) hack is used to find the utf8cpp includes.
if(APPLE)
if(EXISTS /usr/local/include/utf8.h)
include_directories(/usr/local/include)
endif()
endif()
set_target_properties(tag PROPERTIES
VERSION ${TAGLIB_SOVERSION_MAJOR}.${TAGLIB_SOVERSION_MINOR}.${TAGLIB_SOVERSION_PATCH}
SOVERSION ${TAGLIB_SOVERSION_MAJOR}