mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-18 20:04:00 +02:00
Code Issues Releases Wiki Activity

Fix QJson linking

Browse Source
This commit is contained in:
Jeff Mitchell
2011-05-25 11:48:05 -04:00
parent f878e47575
commit c59747e1e1
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeModules/FindQJSON.cmake
View File

@@ -43,4 +43,8 @@ else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR) find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR)
if ( WIN32 OR ( UNIX AND NOT APPLE ) )
set ( QJSON_LIBRARIES "${QJSON_LIBRARIES} ${QJSON_LDFLAGS}" )
endif ()
endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)

12
src/libtomahawk/CMakeLists.txt
View File

@@ -368,8 +368,6 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.
IF( WIN32 ) IF( WIN32 )
SET( OS_SPECIFIC_LINK_LIBRARIES SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
# Thirdparty
${QJSON_LDFLAGS}
# System # System
"iphlpapi.a" "iphlpapi.a"
"ws2_32.dll" "ws2_32.dll"
@@ -387,22 +385,12 @@ IF( APPLE )
SET( OS_SPECIFIC_LINK_LIBRARIES SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
# Thirdparty
${QJSON_LIBRARIES}
# System # System
${COREAUDIO_LIBRARY} ${COREAUDIO_LIBRARY}
${COREFOUNDATION_LIBRARY} ${COREFOUNDATION_LIBRARY}
) )
ENDIF( APPLE ) ENDIF( APPLE )
IF( UNIX AND NOT APPLE )
SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES}
# Thirdparty
${QJSON_LDFLAGS}
)
ENDIF( UNIX AND NOT APPLE )
IF(LIBLASTFM_FOUND) IF(LIBLASTFM_FOUND)
SET(LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_lastfm2 ) SET(LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_lastfm2 )
ENDIF(LIBLASTFM_FOUND) ENDIF(LIBLASTFM_FOUND)