copy 1.2 branch to trunk

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 12 insertions, 17 deletions

diff --git a/src/plugins/General/CMakeLists.txt b/src/plugins/General/CMakeLists.txt
index bbeec67cf..80acaf8b2 100644
--- a/src/plugins/General/CMakeLists.txt
+++ b/src/plugins/General/CMakeLists.txt
@@ -5,7 +5,6 @@ SET(USE_NOTIFIER TRUE CACHE BOOL "enable/disable notifier plugin")
 SET(USE_LYRICS TRUE CACHE BOOL "enable/disable lyrics version")
 SET(USE_HAL (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") CACHE BOOL "enable/disable hal plugin")
 SET(USE_UDISKS2 TRUE CACHE BOOL "enable/disable udisks2 plugin")
-SET(USE_UDISKS FALSE CACHE BOOL "enable/disable udisks plugin")
 SET(USE_HOTKEY TRUE CACHE BOOL "enable/disable global hotkey plugin")
 SET(USE_GNOMEHOTKEY TRUE CACHE BOOL "enable/disable gnome hotkey plugin")
 SET(USE_FILEOPS TRUE CACHE BOOL "enable/disable fileops plugin")
@@ -17,9 +16,9 @@ SET(USE_SB TRUE CACHE BOOL "enable/disable stream browser plugin")
 SET(USE_TRACKCHANGE TRUE CACHE BOOL "enable/disable track change plugin")
 SET(USE_COPYPASTE TRUE CACHE BOOL "enable/disable copy/paste change plugin")
 
-IF(USE_MPRIS)
+IF(USE_MPRIS AND Qt5DBus_FOUND)
 add_subdirectory(mpris)
-ENDIF(USE_MPRIS)
+ENDIF(USE_MPRIS AND Qt5DBus_FOUND)
 
 IF(USE_SCROBBLER)
 add_subdirectory(scrobbler)
@@ -37,21 +36,17 @@ IF(USE_LYRICS)
 add_subdirectory(lyrics)
 ENDIF(USE_LYRICS)
 
-IF(USE_HAL)
+IF(USE_HAL AND Qt5DBus_FOUND)
 add_subdirectory(hal)
-ENDIF(USE_HAL)
+ENDIF(USE_HAL AND Qt5DBus_FOUND)
 
-IF(USE_UDISKS2)
+IF(USE_UDISKS2 AND Qt5DBus_FOUND)
 add_subdirectory(udisks2)
-ENDIF(USE_UDISKS2)
+ENDIF(USE_UDISKS2 AND Qt5DBus_FOUND)
 
-IF(USE_UDISKS)
-add_subdirectory(udisks)
-ENDIF(USE_UDISKS)
-
-IF(USE_HOTKEY)
+IF(USE_HOTKEY AND Qt5X11Extras_FOUND)
 add_subdirectory(hotkey)
-ENDIF(USE_HOTKEY)
+ENDIF(USE_HOTKEY AND Qt5X11Extras_FOUND)
 
 IF(USE_FILEOPS)
 add_subdirectory(fileops)
@@ -61,9 +56,9 @@ IF(USE_COVER)
 add_subdirectory(covermanager)
 ENDIF(USE_COVER)
 
-IF(USE_KDENOTIFY)
+IF(USE_KDENOTIFY AND Qt5DBus_FOUND)
 add_subdirectory(kdenotify)
-ENDIF(USE_KDENOTIFY)
+ENDIF(USE_KDENOTIFY AND Qt5DBus_FOUND)
 
 IF(USE_CONVERTER AND TAGLIB_FOUND)
 add_subdirectory(converter)
@@ -85,6 +80,6 @@ IF(USE_COPYPASTE)
 add_subdirectory(copypaste)
 ENDIF(USE_COPYPASTE)
 
-IF(USE_GNOMEHOTKEY)
+IF(USE_GNOMEHOTKEY AND Qt5DBus_FOUND)
 add_subdirectory(gnomehotkey)
-ENDIF(USE_GNOMEHOTKEY)
+ENDIF(USE_GNOMEHOTKEY AND Qt5DBus_FOUND)