Make PulseAudioQT mandatory

This commit is contained in:
Nicolas Fella 2019-05-01 14:41:50 +02:00
parent 58e2f142e0
commit b48596d7c3
2 changed files with 3 additions and 10 deletions

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()

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,14 +39,5 @@ if(SAILFISHOS OR EXPERIMENTALAPP_ENABLED)
add_subdirectory(remotesystemvolume) add_subdirectory(remotesystemvolume)
endif() endif()
if(KF5PulseAudioQt_FOUND AND NOT WIN32)
add_subdirectory(pausemusic)
endif()
if(KF5PulseAudioQt_FOUND OR WIN32)
add_subdirectory(systemvolume)
endif()
#FIXME: If we split notifications in several files, they won't appear in the same group in the Notifications KCM #FIXME: If we split notifications in several files, they won't appear in the same group in the Notifications KCM
install(FILES kdeconnect.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR}) install(FILES kdeconnect.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})