tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make PulseAudioQT mandatory

Browse source 
The ci issue has been sorted out

This reverts commit d3b41924b5.
This commit is contained in:
Nicolas Fella 2019-05-09 01:05:23 +02:00
parent 67efdc4fef
commit 1d9ea25c2f
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -31,7 +31,7 @@ else()
endif() endif()
set(QCA_MIN_VERSION "2.1.0") set(QCA_MIN_VERSION "2.1.0")
find_package(Qca-qt5 ${QCA_MIN_VERSION} REQUIRED) find_package(Qca-qt5 ${QCA_MIN_VERSION} REQUIRED)
find_package(KF5PulseAudioQt) find_package(KF5PulseAudioQt REQUIRED)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_KEYWORDS) add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_KEYWORDS)
endif() endif()

12
plugins/CMakeLists.txt
View file

@ -7,6 +7,7 @@ add_subdirectory(battery)
add_subdirectory(sendnotifications) add_subdirectory(sendnotifications)
add_subdirectory(mpriscontrol) add_subdirectory(mpriscontrol)
add_subdirectory(photo) add_subdirectory(photo)
add_subdirectory(systemvolume)
if(NOT SAILFISHOS) if(NOT SAILFISHOS)
add_subdirectory(clipboard) add_subdirectory(clipboard)
@ -22,6 +23,7 @@ if(NOT SAILFISHOS)
if(NOT WIN32) if(NOT WIN32)
add_subdirectory(screensaver-inhibit) add_subdirectory(screensaver-inhibit)
add_subdirectory(sftp) add_subdirectory(sftp)
add_subdirectory(pausemusic)
endif() endif()
if(Qt5Multimedia_FOUND) if(Qt5Multimedia_FOUND)
@ -37,12 +39,6 @@ if(SAILFISHOS OR EXPERIMENTALAPP_ENABLED)
add_subdirectory(remotesystemvolume) add_subdirectory(remotesystemvolume)
endif() endif()
if(KF5PulseAudioQt_FOUND AND NOT WIN32) # If we split notifications per plugin, in several notifyrc files, they won't
add_subdirectory(pausemusic) # appear in the same group in the Notifications KCM
endif()
if(KF5PulseAudioQt_FOUND OR WIN32)
add_subdirectory(systemvolume)
endif()
install(FILES kdeconnect.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR}) install(FILES kdeconnect.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})