From 32d82159d91e46a4569b62ed3cfdb3e4bb0d9a56 Mon Sep 17 00:00:00 2001
From: "Guillermo A. Amaral" <g@maral.me>
Date: Fri, 25 Mar 2011 04:19:37 +0800
Subject: [PATCH] Fix to allow building with dependencies that are outside the
 usual system locations.

---
 src/CMakeLists.txt                                           | 1 +
 src/libtomahawk/CMakeLists.txt                               | 1 +
 .../playlist/dynamic/echonest/EchonestSteerer.cpp            | 2 +-
 src/musicscanner.h                                           | 5 +++--
 thirdparty/qtweetlib/CMakeLists.txt                          | 3 ++-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 68b3280bd..babe44b77 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -143,6 +143,7 @@ INCLUDE_DIRECTORIES(
 
 
     ${TAGLIB_INCLUDES}
+    ${QJSON_INCLUDE_DIR}
     ${LIBECHONEST_INCLUDE_DIR}
     ${LIBECHONEST_INCLUDE_DIR}/..
 )
diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index 5dec43bd7..f45c391a3 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -305,6 +305,7 @@ set( libUI ${libUI}
 include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. ..
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${QT_INCLUDE_DIR}
+    ${QJSON_INCLUDE_DIR}
     ${LIBECHONEST_INCLUDE_DIR}
     ${LIBECHONEST_INCLUDE_DIR}/..
     ${CLUCENE_INCLUDE_DIR}
diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
index b029dcf7d..f8f36a34a 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
@@ -25,7 +25,7 @@
 #include <QLineEdit>
 #include <QComboBox>
 #include <QLabel>
-#include <Playlist.h>
+#include <echonest/Playlist.h>
 #include <QPainter>
 #include <QToolButton>
 #include <dynamic/widgets/DynamicWidget.h>
diff --git a/src/musicscanner.h b/src/musicscanner.h
index bfde9e075..8fbca2739 100644
--- a/src/musicscanner.h
+++ b/src/musicscanner.h
@@ -19,8 +19,9 @@
 #ifndef MUSICSCANNER_H
 #define MUSICSCANNER_H
 
-#include <taglib/fileref.h>
-#include <taglib/tag.h>
+/* taglib */
+#include <fileref.h>
+#include <tag.h>
 
 #include <QVariantMap>
 #include <QDir>
diff --git a/thirdparty/qtweetlib/CMakeLists.txt b/thirdparty/qtweetlib/CMakeLists.txt
index 820b950b4..df7fe64d4 100644
--- a/thirdparty/qtweetlib/CMakeLists.txt
+++ b/thirdparty/qtweetlib/CMakeLists.txt
@@ -164,6 +164,7 @@ include_directories(
     .
     ${QT_INCLUDE_DIR}
     ${QT_INCLUDES}
+    ${QJSON_INCLUDE_DIR}
     qtweetlib/src
 )
 
@@ -173,7 +174,7 @@ ADD_LIBRARY(tomahawk_qtweetlib SHARED ${TOMAHAWK_QTWEETLIB_SOURCES} ${TOMAHAWK_Q
 
 target_link_libraries(tomahawk_qtweetlib
     ${QT_LIBRARIES}
-    qjson
+    ${QJSON_LIBRARIES}
 )
 
 INCLUDE( ${CMAKE_CURRENT_SOURCE_DIR}/twitter-api-keys )