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

Revert "Make PulseAudioQT mandatory"

Browse source 
This breaks CI as PAQt is not yet available there

This reverts commit b48596d7c3.
This commit is contained in:
Nicolas Fella 2019-05-01 14:53:30 +02:00
parent c18c7b27f1
commit d3b41924b5
2 changed files with 9 additions and 5 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 REQUIRED) find_package(KF5PulseAudioQt)
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,7 +7,6 @@ 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)
@ -23,7 +22,6 @@ 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)
@ -39,6 +37,12 @@ if(SAILFISHOS OR EXPERIMENTALAPP_ENABLED)
add_subdirectory(remotesystemvolume) add_subdirectory(remotesystemvolume)
endif() endif()
# If we split notifications per plugin, in several notifyrc files, they won't if(KF5PulseAudioQt_FOUND AND NOT WIN32)
# appear in the same group in the Notifications KCM add_subdirectory(pausemusic)
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})