From 85f5856c5536c97abc0b524bc5ce3cb0b40bab2d Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Tue, 26 Sep 2023 21:07:55 +0900
Subject: Fix detection and linking of taglib

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 ConfigureChecks.cmake               | 1 +
 config.h.cmake                      | 2 ++
 plugins/decoder/flac/CMakeLists.txt | 4 +++-
 plugins/decoder/mp3/CMakeLists.txt  | 4 +++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 7047c34..c607e06 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -183,6 +183,7 @@ if( WITH_TAGLIB )
   if( NOT TAGLIB_FOUND )
     tde_message_fatal( "taglib is requested, but was not found on your system" )
   endif( )
+  set( HAVE_TAGLIB 1 )
 endif( )
 
 
diff --git a/config.h.cmake b/config.h.cmake
index 03370d3..c864e46 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -33,3 +33,5 @@
 
 // Don't define HAVE_RESMGR due to it seems to be totally outdated
 // #cmakedefine HAVE_RESMGR
+
+#cmakedefine HAVE_TAGLIB
diff --git a/plugins/decoder/flac/CMakeLists.txt b/plugins/decoder/flac/CMakeLists.txt
index 20e4256..090e3d6 100644
--- a/plugins/decoder/flac/CMakeLists.txt
+++ b/plugins/decoder/flac/CMakeLists.txt
@@ -18,11 +18,13 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/libk3bdevice
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TAGLIB_INCLUDE_DIRS}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
   ${FLAC_LIBRARY_DIRS}
+  ${TAGLIB_LIBRARY_DIRS}
 )
 
 if( ${FLAC_VERSION} VERSION_GREATER "1.1.1" )
@@ -34,7 +36,7 @@ endif( )
 tde_add_kpart( libk3bflacdecoder AUTOMOC
   SOURCES k3bflacdecoder.cpp
   LINK tdecore-shared k3b-shared k3bdevice-shared
-    ${FLAC_LIBRARIES}
+    ${FLAC_LIBRARIES} ${TAGLIB_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/plugins/decoder/mp3/CMakeLists.txt b/plugins/decoder/mp3/CMakeLists.txt
index 4b180f5..a04a4e9 100644
--- a/plugins/decoder/mp3/CMakeLists.txt
+++ b/plugins/decoder/mp3/CMakeLists.txt
@@ -18,11 +18,13 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/libk3bdevice
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TAGLIB_INCLUDE_DIRS}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
   ${MAD_LIBRARY_DIRS}
+  ${TAGLIB_LIBRARY_DIRS}
 )
 
 
@@ -31,7 +33,7 @@ link_directories(
 tde_add_kpart( libk3bmaddecoder AUTOMOC
   SOURCES k3bmad.cpp k3bmaddecoder.cpp
   LINK tdecore-shared k3b-shared k3bdevice-shared
-    ${MAD_LIBRARIES}
+    ${MAD_LIBRARIES} ${TAGLIB_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
-- 
cgit v1.2.1