mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-16 19:14:06 +02:00
Code Issues Releases Wiki Activity

Fix to allow building with dependencies that are outside the usual system locations.

Browse Source
This commit is contained in:
Guillermo A. Amaral
2011-03-25 04:19:37 +08:00
committed by Christian Muehlhaeuser
parent 6d92d158bb
commit 32d82159d9
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@@ -143,6 +143,7 @@ INCLUDE_DIRECTORIES(
${TAGLIB_INCLUDES} ${TAGLIB_INCLUDES}
${QJSON_INCLUDE_DIR}
${LIBECHONEST_INCLUDE_DIR} ${LIBECHONEST_INCLUDE_DIR}
${LIBECHONEST_INCLUDE_DIR}/.. ${LIBECHONEST_INCLUDE_DIR}/..
) )

1
src/libtomahawk/CMakeLists.txt
View File

@@ -305,6 +305,7 @@ set( libUI ${libUI}
include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. .. include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. ..
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}
${QJSON_INCLUDE_DIR}
${LIBECHONEST_INCLUDE_DIR} ${LIBECHONEST_INCLUDE_DIR}
${LIBECHONEST_INCLUDE_DIR}/.. ${LIBECHONEST_INCLUDE_DIR}/..
${CLUCENE_INCLUDE_DIR} ${CLUCENE_INCLUDE_DIR}

2
src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
View File

@@ -25,7 +25,7 @@
#include <QLineEdit> #include <QLineEdit>
#include <QComboBox> #include <QComboBox>
#include <QLabel> #include <QLabel>
#include <Playlist.h> #include <echonest/Playlist.h>
#include <QPainter> #include <QPainter>
#include <QToolButton> #include <QToolButton>
#include <dynamic/widgets/DynamicWidget.h> #include <dynamic/widgets/DynamicWidget.h>

5
src/musicscanner.h
View File

@@ -19,8 +19,9 @@
#ifndef MUSICSCANNER_H #ifndef MUSICSCANNER_H
#define MUSICSCANNER_H #define MUSICSCANNER_H
#include <taglib/fileref.h> /* taglib */
#include <taglib/tag.h> #include <fileref.h>
#include <tag.h>
#include <QVariantMap> #include <QVariantMap>
#include <QDir> #include <QDir>

3
thirdparty/qtweetlib/CMakeLists.txt vendored
View File

@@ -164,6 +164,7 @@ include_directories(
. .
${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}
${QT_INCLUDES} ${QT_INCLUDES}
${QJSON_INCLUDE_DIR}
qtweetlib/src qtweetlib/src
) )
@@ -173,7 +174,7 @@ ADD_LIBRARY(tomahawk_qtweetlib SHARED ${TOMAHAWK_QTWEETLIB_SOURCES} ${TOMAHAWK_Q
target_link_libraries(tomahawk_qtweetlib target_link_libraries(tomahawk_qtweetlib
${QT_LIBRARIES} ${QT_LIBRARIES}
qjson ${QJSON_LIBRARIES}
) )
INCLUDE( ${CMAKE_CURRENT_SOURCE_DIR}/twitter-api-keys ) INCLUDE( ${CMAKE_CURRENT_SOURCE_DIR}/twitter-api-keys )