From 39af6ce632ba04cf9149149b0cd901b7e612a291 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 15 Apr 2014 19:23:17 +0100 Subject: [PATCH] Only require QJson for Qt4 --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cde2a61c1..c03523393 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -238,8 +238,10 @@ macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with T macro_optional_find_package(CLucene 0.9.23) macro_log_feature(CLucene_FOUND "CLucene" "The open-source, C++ search engine" "http://clucene.sf.net" TRUE "" "CLucene is used for indexing the collection") -macro_optional_find_package(QJSON 0.8.1) -macro_log_feature(QJSON_FOUND "QJson" "Qt library that maps JSON data to QVariant objects" "http://qjson.sf.net" TRUE "" "libqjson is used for encoding communication between Tomahawk instances") +if( NOT TOMAHAWK_QT5 ) + macro_optional_find_package(QJSON 0.8.1) + macro_log_feature(QJSON_FOUND "QJson" "Qt library that maps JSON data to QVariant objects" "http://qjson.sf.net" TRUE "" "libqjson is used for encoding communication between Tomahawk instances") +ENDIF() macro_optional_find_package(Taglib 1.6.0) macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")