From 84fc00d55390faa9795939c3cd25e02684e99e2e Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Thu, 4 Jun 2020 21:20:21 +0200 Subject: [PATCH] Use builtin taglib on Windows and set -DTAGLIB_STATIC --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 15cc4d34c..600dc6efe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,14 +131,14 @@ endif() # The current taglib in 3rdparty also has the following features used by Clementine: # - 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) else() option(USE_SYSTEM_TAGLIB "Use system taglib" OFF) endif() 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") 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!") @@ -158,6 +158,7 @@ else() set(TAGLIB_HAS_OPUS ON) add_subdirectory(3rdparty/utf8-cpp) add_subdirectory(3rdparty/taglib) + add_definitions(-DTAGLIB_STATIC) endif() if(LASTFM5_INCLUDE_DIRS AND LASTFM51_INCLUDE_DIRS)