Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Use builtin taglib on Windows and set -DTAGLIB_STATIC

This commit is contained in:
Jonas Kvinge 2020-06-04 21:20:21 +02:00 committed by John Maguire
parent 236cfa7adf
commit 84fc00d553
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -131,14 +131,14 @@ endif()
# The current taglib in 3rdparty also has the following features used by Clementine: # The current taglib in 3rdparty also has the following features used by Clementine:
# - Audio file detection by content. # - Audio file detection by content.
# #
if (TAGLIB_VERSION VERSION_GREATER 1.11.1 OR WIN32) if (TAGLIB_VERSION VERSION_GREATER 1.11.1)
option(USE_SYSTEM_TAGLIB "Use system taglib" ON) option(USE_SYSTEM_TAGLIB "Use system taglib" ON)
else() else()
option(USE_SYSTEM_TAGLIB "Use system taglib" OFF) option(USE_SYSTEM_TAGLIB "Use system taglib" OFF)
endif() endif()
if (TAGLIB_FOUND AND USE_SYSTEM_TAGLIB) if (TAGLIB_FOUND AND USE_SYSTEM_TAGLIB)
if (TAGLIB_VERSION VERSION_GREATER 1.11.1 OR WIN32) if (TAGLIB_VERSION VERSION_GREATER 1.11.1)
message(STATUS "Using system taglib library") message(STATUS "Using system taglib library")
else() else()
message(WARNING "Using system taglib library. Version 1.11.1 or less has a bug corrupting Ogg files, make sure your systems version has been patched!") message(WARNING "Using system taglib library. Version 1.11.1 or less has a bug corrupting Ogg files, make sure your systems version has been patched!")
@ -158,6 +158,7 @@ else()
set(TAGLIB_HAS_OPUS ON) set(TAGLIB_HAS_OPUS ON)
add_subdirectory(3rdparty/utf8-cpp) add_subdirectory(3rdparty/utf8-cpp)
add_subdirectory(3rdparty/taglib) add_subdirectory(3rdparty/taglib)
add_definitions(-DTAGLIB_STATIC)
endif() endif()
if(LASTFM5_INCLUDE_DIRS AND LASTFM51_INCLUDE_DIRS) if(LASTFM5_INCLUDE_DIRS AND LASTFM51_INCLUDE_DIRS)