From 0c123d58e85a90acf1be8018fadc728fe6b68b3f Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Sun, 11 Jul 2010 12:02:30 +0000
Subject: [PATCH] Use a system QtIoCompressor if it's available

---
 CMakeLists.txt                 | 12 ++++++++++--
 src/CMakeLists.txt             |  4 ++--
 src/radio/magnatuneservice.cpp |  3 ++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7f8baeff..4e2f784ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4f0e020d8..59a7c61ed 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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)
diff --git a/src/radio/magnatuneservice.cpp b/src/radio/magnatuneservice.cpp
index c56ebd20c..ab4720e86 100644
--- a/src/radio/magnatuneservice.cpp
+++ b/src/radio/magnatuneservice.cpp
@@ -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>