diff --git a/CMakeModules/FindQJSON.cmake b/CMakeModules/FindQJSON.cmake index 32e294ffd..5460a0a96 100644 --- a/CMakeModules/FindQJSON.cmake +++ b/CMakeModules/FindQJSON.cmake @@ -43,4 +43,8 @@ else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) include(FindPackageHandleStandardArgs) 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) diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index ad53779a6..e0c930896 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -368,8 +368,6 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/. IF( WIN32 ) SET( OS_SPECIFIC_LINK_LIBRARIES ${OS_SPECIFIC_LINK_LIBRARIES} - # Thirdparty - ${QJSON_LDFLAGS} # System "iphlpapi.a" "ws2_32.dll" @@ -387,22 +385,12 @@ IF( APPLE ) SET( OS_SPECIFIC_LINK_LIBRARIES ${OS_SPECIFIC_LINK_LIBRARIES} - # Thirdparty - ${QJSON_LIBRARIES} # System ${COREAUDIO_LIBRARY} ${COREFOUNDATION_LIBRARY} ) 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) SET(LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_lastfm2 ) ENDIF(LIBLASTFM_FOUND)