Fix detection and linking of taglib

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/30/head
Michele Calgaro 1 year ago
parent 147aca7d8e
commit 85f5856c55
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -183,6 +183,7 @@ if( WITH_TAGLIB )
if( NOT TAGLIB_FOUND ) if( NOT TAGLIB_FOUND )
tde_message_fatal( "taglib is requested, but was not found on your system" ) tde_message_fatal( "taglib is requested, but was not found on your system" )
endif( ) endif( )
set( HAVE_TAGLIB 1 )
endif( ) endif( )

@ -33,3 +33,5 @@
// Don't define HAVE_RESMGR due to it seems to be totally outdated // Don't define HAVE_RESMGR due to it seems to be totally outdated
// #cmakedefine HAVE_RESMGR // #cmakedefine HAVE_RESMGR
#cmakedefine HAVE_TAGLIB

@ -18,11 +18,13 @@ include_directories(
${CMAKE_SOURCE_DIR}/libk3bdevice ${CMAKE_SOURCE_DIR}/libk3bdevice
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${TAGLIB_INCLUDE_DIRS}
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TQT_LIBRARY_DIRS}
${FLAC_LIBRARY_DIRS} ${FLAC_LIBRARY_DIRS}
${TAGLIB_LIBRARY_DIRS}
) )
if( ${FLAC_VERSION} VERSION_GREATER "1.1.1" ) if( ${FLAC_VERSION} VERSION_GREATER "1.1.1" )
@ -34,7 +36,7 @@ endif( )
tde_add_kpart( libk3bflacdecoder AUTOMOC tde_add_kpart( libk3bflacdecoder AUTOMOC
SOURCES k3bflacdecoder.cpp SOURCES k3bflacdecoder.cpp
LINK tdecore-shared k3b-shared k3bdevice-shared LINK tdecore-shared k3b-shared k3bdevice-shared
${FLAC_LIBRARIES} ${FLAC_LIBRARIES} ${TAGLIB_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -18,11 +18,13 @@ include_directories(
${CMAKE_SOURCE_DIR}/libk3bdevice ${CMAKE_SOURCE_DIR}/libk3bdevice
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${TAGLIB_INCLUDE_DIRS}
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TQT_LIBRARY_DIRS}
${MAD_LIBRARY_DIRS} ${MAD_LIBRARY_DIRS}
${TAGLIB_LIBRARY_DIRS}
) )
@ -31,7 +33,7 @@ link_directories(
tde_add_kpart( libk3bmaddecoder AUTOMOC tde_add_kpart( libk3bmaddecoder AUTOMOC
SOURCES k3bmad.cpp k3bmaddecoder.cpp SOURCES k3bmad.cpp k3bmaddecoder.cpp
LINK tdecore-shared k3b-shared k3bdevice-shared LINK tdecore-shared k3b-shared k3bdevice-shared
${MAD_LIBRARIES} ${MAD_LIBRARIES} ${TAGLIB_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

Loading…
Cancel
Save