From d16c608610112267474a2b61157f588c4b8afa72 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Mon, 11 Jun 2012 21:13:44 +0200
Subject: [PATCH] * Fixed CMakeLists.txt.
---
src/CMakeLists.txt | 3 +--
src/libtomahawk/CMakeLists.txt | 11 +++++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f283094f5..d58d76de2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -96,7 +96,6 @@ SET( tomahawkUI ${tomahawkUI}
INCLUDE_DIRECTORIES(
.
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/thirdparty/liblastfm2/src
audio
database
@@ -181,7 +180,7 @@ MESSAGE( STATUS "OS_SPECIFIC_LINK_LIBRARIES: ${OS_SPECIFIC_LINK_LIBRARIES}" )
SET(LINK_LIBRARIES "")
IF(LIBLASTFM_FOUND)
- SET(LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_lastfm2 )
+ SET(LINK_LIBRARIES ${LINK_LIBRARIES} lastfm )
ENDIF(LIBLASTFM_FOUND)
IF(QCA2_FOUND)
SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} )
diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index cd58acc37..b85466c97 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -6,6 +6,10 @@ SET( QT_USE_QTNETWORK TRUE )
SET( QT_USE_QTXML TRUE )
SET( QT_USE_QTUITOOLS TRUE )
+IF( UNIX AND NOT APPLE )
+ SET( QT_USE_QTDBUS TRUE )
+ENDIF( UNIX AND NOT APPLE )
+
include( ${QT_USE_FILE} )
add_definitions( ${QT_DEFINITIONS} )
@@ -327,7 +331,6 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.
${LIBECHONEST_INCLUDE_DIR}/..
${CLUCENE_INCLUDE_DIRS}
${PHONON_INCLUDES}
- ${CMAKE_BINARY_DIR}/thirdparty/liblastfm2/src
playlist
@@ -398,7 +401,7 @@ ELSE( APPLE )
ENDIF( APPLE )
IF(LIBLASTFM_FOUND)
- SET(LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_lastfm2 )
+ SET(LINK_LIBRARIES ${LINK_LIBRARIES} lastfm )
ENDIF(LIBLASTFM_FOUND)
IF(BUILD_GUI)
@@ -420,6 +423,10 @@ IF(LIBATTICA_FOUND)
SET( LINK_LIBRARIES ${LINK_LIBRARIES} ${LIBATTICA_LIBRARIES} ${QuaZip_LIBRARIES} )
ENDIF(LIBATTICA_FOUND)
+IF( UNIX AND NOT APPLE )
+ SET( LINK_LIBRARIES ${LINK_LIBRARIES} ${QT_QTDBUS_LIBRARY} )
+ENDIF( UNIX AND NOT APPLE )
+
TARGET_LINK_LIBRARIES( tomahawklib
# Thirdparty shipped with tomahawk
${LIBPORTFWD_LIBRARIES}