From 1758a7aeef7644e824618d28c3aa6f86ff187138 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Sat, 10 Oct 2015 21:37:13 +0200 Subject: [PATCH] Fix tools build on OSX --- src/libtomahawk/CMakeLists.txt | 5 ++++- src/tomahawk/CMakeLists.txt | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 02c0dfe0e..5da56cce6 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -534,7 +534,6 @@ TARGET_LINK_LIBRARIES( ${TOMAHAWK_LIBRARY} LINK_PUBLIC # External deps ${QJSON_LIBRARIES} - ${TAGLIB_LIBRARIES} ${LUCENEPP_LIBRARIES} ${ECHONEST_LIBRARIES} ${QT_QTSQL_LIBRARY} @@ -551,6 +550,10 @@ TARGET_LINK_LIBRARIES( ${TOMAHAWK_LIBRARY} ${LINK_LIBRARIES} ) +# TagLib +TARGET_LINK_LIBRARIES(${TOMAHAWK_LIBRARY} LINK_PUBLIC ${TAGLIB_LIBRARIES}) +TARGET_INCLUDE_DIRECTORIES(${TOMAHAWK_LIBRARY} PUBLIC ${TAGLIB_INCLUDES}) + INSTALL( TARGETS ${TOMAHAWK_LIBRARY} EXPORT TomahawkLibraryDepends RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt index e11812ffd..08e8d8f7c 100644 --- a/src/tomahawk/CMakeLists.txt +++ b/src/tomahawk/CMakeLists.txt @@ -102,7 +102,6 @@ INCLUDE_DIRECTORIES( ${THIRDPARTY_DIR}/libcrashreporter-qt/src/ ${THIRDPARTY_DIR}/kdsingleapplicationguard/ - ${TAGLIB_INCLUDES} ${LIBATTICA_INCLUDE_DIR} ${ECHONEST_INCLUDE_DIR} ${LIBLASTFM_INCLUDE_DIRS} @@ -199,7 +198,6 @@ TARGET_LINK_LIBRARIES( ${TOMAHAWK_APPLICATION_TARGET} ${QT_LIBRARIES} ${MAC_EXTRA_LIBS} ${ECHONEST_LIBRARIES} - ${TAGLIB_LIBRARIES} ${Boost_LIBRARIES} )