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

* Fixed CMakeLists.txt.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-06-11 21:13:44 +02:00
parent 4f261b1711
commit d16c608610
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMakeLists.txt
View File

@@ -96,7 +96,6 @@ SET( tomahawkUI ${tomahawkUI}
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
. .
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/thirdparty/liblastfm2/src
audio audio
database database
@@ -181,7 +180,7 @@ MESSAGE( STATUS "OS_SPECIFIC_LINK_LIBRARIES: ${OS_SPECIFIC_LINK_LIBRARIES}" )
SET(LINK_LIBRARIES "") SET(LINK_LIBRARIES "")
IF(LIBLASTFM_FOUND) IF(LIBLASTFM_FOUND)
SET(LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_lastfm2 ) SET(LINK_LIBRARIES ${LINK_LIBRARIES} lastfm )
ENDIF(LIBLASTFM_FOUND) ENDIF(LIBLASTFM_FOUND)
IF(QCA2_FOUND) IF(QCA2_FOUND)
SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} ) SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} )

11
src/libtomahawk/CMakeLists.txt
View File

@@ -6,6 +6,10 @@ SET( QT_USE_QTNETWORK TRUE )
SET( QT_USE_QTXML TRUE ) SET( QT_USE_QTXML TRUE )
SET( QT_USE_QTUITOOLS 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} ) include( ${QT_USE_FILE} )
add_definitions( ${QT_DEFINITIONS} ) add_definitions( ${QT_DEFINITIONS} )
@@ -327,7 +331,6 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.
${LIBECHONEST_INCLUDE_DIR}/.. ${LIBECHONEST_INCLUDE_DIR}/..
${CLUCENE_INCLUDE_DIRS} ${CLUCENE_INCLUDE_DIRS}
${PHONON_INCLUDES} ${PHONON_INCLUDES}
${CMAKE_BINARY_DIR}/thirdparty/liblastfm2/src
playlist playlist
@@ -398,7 +401,7 @@ ELSE( APPLE )
ENDIF( APPLE ) ENDIF( APPLE )
IF(LIBLASTFM_FOUND) IF(LIBLASTFM_FOUND)
SET(LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_lastfm2 ) SET(LINK_LIBRARIES ${LINK_LIBRARIES} lastfm )
ENDIF(LIBLASTFM_FOUND) ENDIF(LIBLASTFM_FOUND)
IF(BUILD_GUI) IF(BUILD_GUI)
@@ -420,6 +423,10 @@ IF(LIBATTICA_FOUND)
SET( LINK_LIBRARIES ${LINK_LIBRARIES} ${LIBATTICA_LIBRARIES} ${QuaZip_LIBRARIES} ) SET( LINK_LIBRARIES ${LINK_LIBRARIES} ${LIBATTICA_LIBRARIES} ${QuaZip_LIBRARIES} )
ENDIF(LIBATTICA_FOUND) 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 TARGET_LINK_LIBRARIES( tomahawklib
# Thirdparty shipped with tomahawk # Thirdparty shipped with tomahawk
${LIBPORTFWD_LIBRARIES} ${LIBPORTFWD_LIBRARIES}