dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix discogs album cover fetching. Remove QJSON dependency.

Browse Source
This commit is contained in:
Jonas Kvinge
2018-03-02 22:51:42 +01:00
parent b2b1ba7abe
commit 2be8f88d73
9 changed files with 342 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -143,7 +143,7 @@ if(LASTFM5_INCLUDE_DIRS AND LASTFM51_INCLUDE_DIRS)
endif()
# QJSON
CHECK_INCLUDE_FILES(qjson/parser.h QJSON_PARSER_H)
#CHECK_INCLUDE_FILES(qjson/parser.h QJSON_PARSER_H)
# CHROMAPRINT
CHECK_INCLUDE_FILES(chromaprint.h CHROMAPRINT_H)
@@ -164,7 +164,7 @@ endif(${CMAKE_BUILD_TYPE} MATCHES "Release")
# Set up definitions and paths
add_definitions(${QT_DEFINITIONS})
link_directories(${TAGLIB_LIBRARY_DIRS})
link_directories(${QJSON_LIBRARY_DIRS})
#link_directories(${QJSON_LIBRARY_DIRS})
link_directories(${GSTREAMER_LIBRARY_DIRS})
# Don't try to use webkit if their include directories couldn't be found.
@@ -369,8 +369,8 @@ endif()
add_subdirectory(3rdparty/qocoa)
# QJSON
add_subdirectory(3rdparty/qjson)
set(QJSON_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qjson ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qjson/include)
#add_subdirectory(3rdparty/qjson)
#set(QJSON_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qjson ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qjson/include)
# Subdirectories
add_subdirectory(src)