updated cmake support

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

3 files changed, 79 insertions, 66 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3807d00be..400fcb00d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,7 @@ find_package(Qt5X11Extras 5.4.0)
 find_package(Qt5DBus 5.4.0)
 find_package(Qt5Multimedia 5.4.0)
 find_package(Qt5Sql 5.4.0)
+find_package(QtWinExtras 5.4.0)
 ADD_DEFINITIONS(-DQMMP_WS_X11)
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
@@ -152,93 +153,95 @@ ENDIF(UNIX)
 
 MESSAGE("")
 MESSAGE("Transports:")
-PRINT_SUMMARY ("HTTP support ......................" USE_CURL CURL_FOUND)
-PRINT_SUMMARY ("MMS support ......................." USE_MMS MMS_FOUND)
+PRINT_SUMMARY ("HTTP support .........................." USE_CURL CURL_FOUND)
+PRINT_SUMMARY ("MMS support ..........................." USE_MMS MMS_FOUND)
 
 MESSAGE("")
 MESSAGE("Input Plugins:")
-PRINT_SUMMARY ("MPEG support ......................" 1 MAD_FOUND OR MPG123_FOUND)
-PRINT_SUMMARY ("FLAC support ......................" USE_FLAC FLAC_FOUND)
-PRINT_SUMMARY ("Ogg Vorbis support ................" USE_VORBIS VORBIS_FOUND)
-PRINT_SUMMARY ("Musepack support .................." USE_MPC MPC_FOUND)
-PRINT_SUMMARY ("MOD support ......................." USE_MODPLUG MODPLUG_FOUND)
-PRINT_SUMMARY ("Wave support ......................" USE_SNDFILE SNDFILE_FOUND)
-PRINT_SUMMARY ("WavPack support ..................." USE_WAVPACK WAVPACK_FOUND)
-PRINT_SUMMARY ("FFmpeg/Libav support .............." USE_FFMPEG FFMPEG_FOUND)
-PRINT_SUMMARY ("AAC support ......................." USE_AAC FAAD_FOUND)
-PRINT_SUMMARY ("CUE sheet support ................." USE_CUE 1)
-PRINT_SUMMARY ("Mplayer support ..................." USE_MPLAYER 1)
-PRINT_SUMMARY ("CD Audio support .................." USE_CDA CDIO_FOUND)
-PRINT_SUMMARY ("Midi support ......................" USE_MIDI WILDMIDI_FOUND)
-PRINT_SUMMARY ("Game music support ................" USE_GME GME_FOUND)
-PRINT_SUMMARY ("Ogg Opus support .................." USE_OPUS OPUS_FOUND)
-PRINT_SUMMARY ("SID support ......................." USE_SID SIDPLAYFP_FOUND)
-PRINT_SUMMARY ("Archive support ..................." USE_ARCHIVE LIBARCHIVE_FOUND)
+PRINT_SUMMARY ("MPEG support .........................." 1 MAD_FOUND OR MPG123_FOUND)
+PRINT_SUMMARY ("FLAC support .........................." USE_FLAC FLAC_FOUND)
+PRINT_SUMMARY ("Ogg Vorbis support ...................." USE_VORBIS VORBIS_FOUND)
+PRINT_SUMMARY ("Musepack support ......................" USE_MPC MPC_FOUND)
+PRINT_SUMMARY ("MOD support ..........................." USE_MODPLUG MODPLUG_FOUND)
+PRINT_SUMMARY ("Wave support .........................." USE_SNDFILE SNDFILE_FOUND)
+PRINT_SUMMARY ("WavPack support ......................." USE_WAVPACK WAVPACK_FOUND)
+PRINT_SUMMARY ("FFmpeg/Libav support .................." USE_FFMPEG FFMPEG_FOUND)
+PRINT_SUMMARY ("AAC support ..........................." USE_AAC FAAD_FOUND)
+PRINT_SUMMARY ("CUE sheet support ....................." USE_CUE 1)
+PRINT_SUMMARY ("Mplayer support ......................." USE_MPLAYER 1)
+PRINT_SUMMARY ("CD Audio support ......................" USE_CDA CDIO_FOUND)
+PRINT_SUMMARY ("Midi support .........................." USE_MIDI WILDMIDI_FOUND)
+PRINT_SUMMARY ("Game music support ...................." USE_GME GME_FOUND)
+PRINT_SUMMARY ("Ogg Opus support ......................" USE_OPUS OPUS_FOUND)
+PRINT_SUMMARY ("SID support ..........................." USE_SID SIDPLAYFP_FOUND)
+PRINT_SUMMARY ("Archive support ......................." USE_ARCHIVE LIBARCHIVE_FOUND)
 
 MESSAGE("")
 MESSAGE("Output Plugins:")
-PRINT_SUMMARY ("ALSA support ......................" USE_ALSA ALSA_FOUND)
-PRINT_SUMMARY ("OSS support ......................." USE_OSS 1)
-PRINT_SUMMARY ("OSS4 support ......................" USE_OSS4 OSS4_FOUND)
-PRINT_SUMMARY ("JACK support ......................" USE_JACK JACK_FOUND)
-PRINT_SUMMARY ("PulseAudio support ................" USE_PULSE PULSE_FOUND)
-PRINT_SUMMARY ("Null output support ..............." USE_NULL 1)
-PRINT_SUMMARY ("Win32 Waveout support ............." USE_WAVEOUT WINDOWS_H_FOUND)
-PRINT_SUMMARY ("Win32 DirectSound support ........." USE_DSOUND DSOUND_H_FOUND)
-PRINT_SUMMARY ("Win32 WASAPI support .............." USE_WASAPI WASAPI_FOUND)
-PRINT_SUMMARY ("Qt Multimedia support ............." USE_QTMULTIMEDIA Qt5Multimedia_FOUND)
-PRINT_SUMMARY ("Icecast support ..................." USE_SHOUT SHOUT_FOUND)
+PRINT_SUMMARY ("ALSA support .........................." USE_ALSA ALSA_FOUND)
+PRINT_SUMMARY ("OSS support ..........................." USE_OSS 1)
+PRINT_SUMMARY ("OSS4 support .........................." USE_OSS4 OSS4_FOUND)
+PRINT_SUMMARY ("JACK support .........................." USE_JACK JACK_FOUND)
+PRINT_SUMMARY ("PulseAudio support ...................." USE_PULSE PULSE_FOUND)
+PRINT_SUMMARY ("Null output support ..................." USE_NULL 1)
+PRINT_SUMMARY ("Waveout support (Windows) ............." USE_WAVEOUT WINDOWS_H_FOUND)
+PRINT_SUMMARY ("DirectSound support (Windows) ........." USE_DSOUND DSOUND_H_FOUND)
+PRINT_SUMMARY ("WASAPI support (Windows) .............." USE_WASAPI WASAPI_FOUND)
+PRINT_SUMMARY ("Qt Multimedia support ................." USE_QTMULTIMEDIA Qt5Multimedia_FOUND)
+PRINT_SUMMARY ("Icecast support ......................." USE_SHOUT SHOUT_FOUND)
 
 MESSAGE("")
 MESSAGE("Effect Plugins:")
-PRINT_SUMMARY ("SoX Resampler ....................." USE_SOXR SOXR_FOUND)
-PRINT_SUMMARY ("BS2B Plugin ......................." USE_BS2B BS2B_FOUND)
-PRINT_SUMMARY ("LADSPA Host ......................." USE_LADSPA 1)
-PRINT_SUMMARY ("Crossfade ........................." USE_CROSSFADE 1)
-PRINT_SUMMARY ("Extra Stereo ......................" USE_STEREO 1)
-PRINT_SUMMARY ("File Writer ......................." USE_FILEWRITER VORBISENC_FOUND)
-PRINT_SUMMARY ("Mono to Stereo Converter .........." USE_MONOTOSTEREO 1)
+PRINT_SUMMARY ("SoX Resampler ........................." USE_SOXR SOXR_FOUND)
+PRINT_SUMMARY ("BS2B Plugin ..........................." USE_BS2B BS2B_FOUND)
+PRINT_SUMMARY ("LADSPA Host ..........................." USE_LADSPA 1)
+PRINT_SUMMARY ("Crossfade ............................." USE_CROSSFADE 1)
+PRINT_SUMMARY ("Extra Stereo .........................." USE_STEREO 1)
+PRINT_SUMMARY ("File Writer ..........................." USE_FILEWRITER VORBISENC_FOUND)
+PRINT_SUMMARY ("Mono to Stereo Converter .............." USE_MONOTOSTEREO 1)
 
 MESSAGE("")
 MESSAGE("Visual Plugins:")
-PRINT_SUMMARY ("Analyzer .........................." USE_ANALYZER 1)
-PRINT_SUMMARY ("ProjectM .........................." USE_PROJECTM PROJECTM_FOUND)
+PRINT_SUMMARY ("Analyzer .............................." USE_ANALYZER 1)
+PRINT_SUMMARY ("ProjectM .............................." USE_PROJECTM PROJECTM_FOUND)
 
 MESSAGE("")
 MESSAGE("General Plugins:")
-PRINT_SUMMARY ("MPRIS support ....................." USE_MPRIS Qt5DBus_FOUND)
-PRINT_SUMMARY ("Scrobbler ........................." USE_SCROBBLER 1)
-PRINT_SUMMARY ("Tray support ......................" USE_STATICON 1)
-PRINT_SUMMARY ("Notifier support .................." USE_NOTIFIER 1)
-PRINT_SUMMARY ("Lyrics support ...................." USE_LYRICS 1)
-PRINT_SUMMARY ("HAL support ......................." USE_HAL Qt5DBus_FOUND)
-PRINT_SUMMARY ("UDisks2 support ..................." USE_UDISKS2 Qt5DBus_FOUND)
-PRINT_SUMMARY ("Global hotkey support ............." USE_HOTKEY X11_FOUND AND XCB_H_FOUND AND Qt5X11Extras_FOUND)
-PRINT_SUMMARY ("GNOME/Cinnamon hotkey support ....." USE_GNOMEHOTKEY Qt5DBus_FOUND)
-PRINT_SUMMARY ("File operations ..................." USE_FILEOPS 1)
-PRINT_SUMMARY ("Cover manager ....................." USE_COVER 1)
-PRINT_SUMMARY ("KDE notifications support ........." USE_KDENOTIFY Qt5DBus_FOUND)
-PRINT_SUMMARY ("Audio converter ..................." USE_CONVERTER TAGLIB_FOUND)
-PRINT_SUMMARY ("ReplayGain Scanner ................" USE_RGSCAN TAGLIB_FOUND)
-PRINT_SUMMARY ("Stream browser ...................." USE_SB 1)
-PRINT_SUMMARY ("Track change ......................" USE_TRACKCHANGE 1)
-PRINT_SUMMARY ("Copy/Paste ........................" USE_COPYPASTE 1)
-PRINT_SUMMARY ("History plugin ...................." USE_HISTORY Qt5Sql_FOUND)
+PRINT_SUMMARY ("MPRIS support ........................." USE_MPRIS Qt5DBus_FOUND)
+PRINT_SUMMARY ("Scrobbler ............................." USE_SCROBBLER 1)
+PRINT_SUMMARY ("Tray support .........................." USE_STATICON 1)
+PRINT_SUMMARY ("Notifier support ......................" USE_NOTIFIER 1)
+PRINT_SUMMARY ("Lyrics support ........................" USE_LYRICS 1)
+PRINT_SUMMARY ("HAL support ..........................." USE_HAL Qt5DBus_FOUND)
+PRINT_SUMMARY ("UDisks2 support ......................." USE_UDISKS2 Qt5DBus_FOUND)
+PRINT_SUMMARY ("Global hotkey support ................." USE_HOTKEY X11_FOUND AND XCB_H_FOUND AND Qt5X11Extras_FOUND)
+PRINT_SUMMARY ("GNOME/Cinnamon hotkey support ........." USE_GNOMEHOTKEY Qt5DBus_FOUND)
+PRINT_SUMMARY ("File operations ......................." USE_FILEOPS 1)
+PRINT_SUMMARY ("Cover manager ........................." USE_COVER 1)
+PRINT_SUMMARY ("KDE notifications support ............." USE_KDENOTIFY Qt5DBus_FOUND)
+PRINT_SUMMARY ("Audio converter ......................." USE_CONVERTER TAGLIB_FOUND)
+PRINT_SUMMARY ("ReplayGain Scanner ...................." USE_RGSCAN TAGLIB_FOUND)
+PRINT_SUMMARY ("Stream browser ........................" USE_SB 1)
+PRINT_SUMMARY ("Track change .........................." USE_TRACKCHANGE 1)
+PRINT_SUMMARY ("Copy/Paste ............................" USE_COPYPASTE 1)
+PRINT_SUMMARY ("History plugin ........................" USE_HISTORY Qt5Sql_FOUND)
+PRINT_SUMMARY ("Taskbar plugin (Windows) .............." USE_TASKBAR Qt5WinExtras_FOUND)
+PRINT_SUMMARY ("Removable device detection (Windows) .." USE_RDETECT Qt5WinExtras_FOUND)
 
 MESSAGE("")
 MESSAGE("File Dialogs:")
-PRINT_SUMMARY ("QMMP File Dialog .................." USE_QMMP_DIALOG 1)
-PRINT_SUMMARY ("Two-panel File File Dialog ........" USE_TWO_PANEL_DIALOG 1)
+PRINT_SUMMARY ("QMMP File Dialog ......................" USE_QMMP_DIALOG 1)
+PRINT_SUMMARY ("Two-panel File File Dialog ............" USE_TWO_PANEL_DIALOG 1)
 
 MESSAGE("")
 MESSAGE("Advanced:")
-PRINT_SUMMARY ("Skinned user interface ............" USE_SKINNED X11_FOUND AND Qt5X11Extras_FOUND)
-PRINT_SUMMARY ("Simple user interface (QSUI) ......" USE_QSUI 1)
-PRINT_SUMMARY ("Automatic charset detection ......." USE_ENCA ENCA_FOUND)
-PRINT_SUMMARY ("Directory association ............." USE_DIR_ASSOC 1)
-PRINT_SUMMARY ("Set RPATH in installed binaries ..." CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
+PRINT_SUMMARY ("Skinned user interface ................" USE_SKINNED X11_FOUND AND Qt5X11Extras_FOUND)
+PRINT_SUMMARY ("Simple user interface (QSUI) .........." USE_QSUI 1)
+PRINT_SUMMARY ("Automatic charset detection ..........." USE_ENCA ENCA_FOUND)
+PRINT_SUMMARY ("Directory association ................." USE_DIR_ASSOC 1)
+PRINT_SUMMARY ("Set RPATH in installed binaries ......." CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
 IF(MPEG_DECODERS)
-MESSAGE       ("MPEG decoders ....................." "${MPEG_DECODERS}")
+MESSAGE       ("MPEG decoders ........................." "${MPEG_DECODERS}")
 ENDIF(MPEG_DECODERS)
 
 MESSAGE("")
diff --git a/src/plugins/General/CMakeLists.txt b/src/plugins/General/CMakeLists.txt
index 180020bbb..a4228058f 100644
--- a/src/plugins/General/CMakeLists.txt
+++ b/src/plugins/General/CMakeLists.txt
@@ -16,6 +16,8 @@ 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")
 SET(USE_HISTORY TRUE CACHE BOOL "enable/disable history plugin")
+SET(USE_TASKBAR TRUE CACHE BOOL "enable/disable taskbar plugin (Windows)")
+SET(USE_RDETECT TRUE CACHE BOOL "enable/disable rdetect plugin (Windows)")
 
 IF(USE_MPRIS AND Qt5DBus_FOUND)
 add_subdirectory(mpris)
@@ -88,3 +90,11 @@ ENDIF(USE_GNOMEHOTKEY AND Qt5DBus_FOUND)
 IF(USE_HISTORY AND Qt5Sql_FOUND)
 add_subdirectory(history)
 ENDIF(USE_HISTORY AND Qt5Sql_FOUND)
+
+IF(USE_TASKBAR AND Qt5WinExtras_FOUND)
+add_subdirectory(taskbar)
+ENDIF(USE_TASKBAR AND Qt5WinExtras_FOUND)
+
+IF(USE_RDETECT AND Qt5WinExtras_FOUND)
+add_subdirectory(rdetect)
+ENDIF(USE_RDETECT AND Qt5WinExtras_FOUND)
diff --git a/src/plugins/General/rdetect/rdetect.pro b/src/plugins/General/rdetect/rdetect.pro
index 6e62b8401..8a52b61ea 100644
--- a/src/plugins/General/rdetect/rdetect.pro
+++ b/src/plugins/General/rdetect/rdetect.pro
@@ -12,7 +12,7 @@ SOURCES += rdetectfactory.cpp \
 

 FORMS += settingsdialog.ui

 

-#RESOURCES = translations/translations.qrc

+RESOURCES = translations/translations.qrc

 

 LIBS += $$QMMPUI_LIB