Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a system QtIoCompressor if it's available

Browse Source
This commit is contained in:
David Sansome 2010-07-11 12:02:30 +00:00
parent 9be9a7cc0a
commit 0c123d58e8
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -170,9 +170,17 @@ else(USE_SYSTEM_QTSINGLEAPPLICATION)
set(QTSINGLEAPPLICATION_LIBRARIES qtsingleapplication) set(QTSINGLEAPPLICATION_LIBRARIES qtsingleapplication)
endif(USE_SYSTEM_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) add_subdirectory(src)
if (NOT APPLE) if (NOT APPLE)
add_subdirectory(3rdparty/qxt) add_subdirectory(3rdparty/qxt)

4
src/CMakeLists.txt
View File

@ -6,7 +6,6 @@ set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall")
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${SPARKLE}) include_directories(${SPARKLE})
include_directories(../3rdparty/gmock/gtest/include) include_directories(../3rdparty/gmock/gtest/include)
include_directories(../3rdparty/qtiocompressor)
include_directories(../3rdparty/qtwin) include_directories(../3rdparty/qtwin)
include_directories(../3rdparty/qxt) include_directories(../3rdparty/qxt)
@ -15,6 +14,7 @@ include_directories(${LIBXML_INCLUDE_DIRS})
include_directories(${GOBJECT_INCLUDE_DIRS}) include_directories(${GOBJECT_INCLUDE_DIRS})
include_directories(${LIBPROJECTM_INCLUDE_DIRS}) include_directories(${LIBPROJECTM_INCLUDE_DIRS})
include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS}) include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS})
include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS})
cmake_policy(SET CMP0011 NEW) cmake_policy(SET CMP0011 NEW)
include(../cmake/AddEngine.cmake) include(../cmake/AddEngine.cmake)
@ -517,7 +517,6 @@ add_library(clementine_lib STATIC
add_dependencies(clementine_lib pot) add_dependencies(clementine_lib pot)
target_link_libraries(clementine_lib target_link_libraries(clementine_lib
qtiocompressor
qtwin qtwin
chardet chardet
${GOBJECT_LIBRARIES} ${GOBJECT_LIBRARIES}
@ -527,6 +526,7 @@ target_link_libraries(clementine_lib
${ENGINE_LIBRARIES} ${ENGINE_LIBRARIES}
${LASTFM_LIBRARIES} ${LASTFM_LIBRARIES}
${QTSINGLEAPPLICATION_LIBRARIES} ${QTSINGLEAPPLICATION_LIBRARIES}
${QTIOCOMPRESSOR_LIBRARIES}
) )
if(ENABLE_VISUALISATIONS) if(ENABLE_VISUALISATIONS)

3
src/radio/magnatuneservice.cpp
View File

@ -28,11 +28,12 @@
#include "ui/iconloader.h" #include "ui/iconloader.h"
#include "ui/settingsdialog.h" #include "ui/settingsdialog.h"
#include "qtiocompressor.h"
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QNetworkReply> #include <QNetworkReply>
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include <QtIOCompressor>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include <QMenu> #include <QMenu>
#include <QDesktopServices> #include <QDesktopServices>