mirror of
https://github.com/clementine-player/Clementine
synced 2024-12-15 10:48:33 +01:00
Use a system QtIoCompressor if it's available
This commit is contained in:
parent
9be9a7cc0a
commit
0c123d58e8
@ -170,9 +170,17 @@ else(USE_SYSTEM_QTSINGLEAPPLICATION)
|
||||
set(QTSINGLEAPPLICATION_LIBRARIES qtsingleapplication)
|
||||
endif(USE_SYSTEM_QTSINGLEAPPLICATION)
|
||||
|
||||
# Subdirectories
|
||||
# QtIoCompressor isn't patched, so we can use a system version if it's
|
||||
# available
|
||||
find_path(QTIOCOMPRESSOR_INCLUDE_DIRS qtiocompressor.h PATH_SUFFIXES QtSolutions)
|
||||
find_library(QTIOCOMPRESSOR_LIBRARIES QtSolutions_IOCompressor-2.3)
|
||||
if(NOT QTIOCOMPRESSOR_INCLUDE_DIRS OR NOT QTIOCOMPRESSOR_LIBRARIES)
|
||||
add_subdirectory(3rdparty/qtiocompressor)
|
||||
set(QTIOCOMPRESSOR_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtiocompressor)
|
||||
set(QTIOCOMPRESSOR_LIBRARIES qtiocompressor)
|
||||
endif(NOT QTIOCOMPRESSOR_INCLUDE_DIRS OR NOT QTIOCOMPRESSOR_LIBRARIES)
|
||||
|
||||
add_subdirectory(3rdparty/qtiocompressor)
|
||||
# Subdirectories
|
||||
add_subdirectory(src)
|
||||
if (NOT APPLE)
|
||||
add_subdirectory(3rdparty/qxt)
|
||||
|
@ -6,7 +6,6 @@ set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall")
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
include_directories(${SPARKLE})
|
||||
include_directories(../3rdparty/gmock/gtest/include)
|
||||
include_directories(../3rdparty/qtiocompressor)
|
||||
include_directories(../3rdparty/qtwin)
|
||||
include_directories(../3rdparty/qxt)
|
||||
|
||||
@ -15,6 +14,7 @@ include_directories(${LIBXML_INCLUDE_DIRS})
|
||||
include_directories(${GOBJECT_INCLUDE_DIRS})
|
||||
include_directories(${LIBPROJECTM_INCLUDE_DIRS})
|
||||
include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS})
|
||||
include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS})
|
||||
|
||||
cmake_policy(SET CMP0011 NEW)
|
||||
include(../cmake/AddEngine.cmake)
|
||||
@ -517,7 +517,6 @@ add_library(clementine_lib STATIC
|
||||
add_dependencies(clementine_lib pot)
|
||||
|
||||
target_link_libraries(clementine_lib
|
||||
qtiocompressor
|
||||
qtwin
|
||||
chardet
|
||||
${GOBJECT_LIBRARIES}
|
||||
@ -527,6 +526,7 @@ target_link_libraries(clementine_lib
|
||||
${ENGINE_LIBRARIES}
|
||||
${LASTFM_LIBRARIES}
|
||||
${QTSINGLEAPPLICATION_LIBRARIES}
|
||||
${QTIOCOMPRESSOR_LIBRARIES}
|
||||
)
|
||||
|
||||
if(ENABLE_VISUALISATIONS)
|
||||
|
@ -28,11 +28,12 @@
|
||||
#include "ui/iconloader.h"
|
||||
#include "ui/settingsdialog.h"
|
||||
|
||||
#include "qtiocompressor.h"
|
||||
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QNetworkRequest>
|
||||
#include <QNetworkReply>
|
||||
#include <QXmlStreamReader>
|
||||
#include <QtIOCompressor>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QMenu>
|
||||
#include <QDesktopServices>
|
||||
|
Loading…
Reference in New Issue
Block a user