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

* Fixed linking QJson on OS X.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-03-24 19:35:49 +01:00
parent 192a9ac380
commit 4558fd7e22
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libtomahawk/CMakeLists.txt
View File

@@ -333,6 +333,7 @@ IF( WIN32 )
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
# Thirdparty # Thirdparty
${CMAKE_BINARY_DIR}/thirdparty/rtaudio/librtaudio.dll ${CMAKE_BINARY_DIR}/thirdparty/rtaudio/librtaudio.dll
${QJSON_LDFLAGS}
# System # System
"iphlpapi.a" "iphlpapi.a"
"ws2_32.dll" "ws2_32.dll"
@@ -354,6 +355,7 @@ IF( APPLE )
SET( OS_SPECIFIC_LINK_LIBRARIES SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
# Thirdparty # Thirdparty
${QJSON_LIBRARIES}
rtaudio rtaudio
# System # System
${COREAUDIO_LIBRARY} ${COREAUDIO_LIBRARY}
@@ -366,6 +368,7 @@ IF( UNIX AND NOT APPLE )
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
# Thirdparty # Thirdparty
alsaplayback alsaplayback
${QJSON_LDFLAGS}
) )
ENDIF( UNIX AND NOT APPLE ) ENDIF( UNIX AND NOT APPLE )
@@ -392,8 +395,6 @@ target_link_libraries( tomahawklib
# External deps # External deps
${TAGLIB_LIBRARIES} ${TAGLIB_LIBRARIES}
${QJSON_LDFLAGS}
${QJSON_LIBRARIES}
${CLUCENE_LIBRARIES} ${CLUCENE_LIBRARIES}
${LIBECHONEST_LIBRARY} ${LIBECHONEST_LIBRARY}
${QT_LIBRARIES} ${QT_LIBRARIES}