diff options
| author | Johannes Hirte <johannes.hirte@datenkhaos.de> | 2017-11-14 08:54:31 +0100 |
|---|---|---|
| committer | Christophe Giboudeaux <christophe@krop.fr> | 2017-11-14 08:57:08 +0100 |
| commit | c02178fa380c799edc03250e3e92ad7f15d50dd1 (patch) | |
| tree | 9ebc72d7a4fdc67e18c9b40396ad7ef84cf7c00f | |
| parent | 279310489278e6eb9239b87f71a50da1626c427e (diff) | |
| download | extra-cmake-modules-c02178fa380c799edc03250e3e92ad7f15d50dd1.tar.gz extra-cmake-modules-c02178fa380c799edc03250e3e92ad7f15d50dd1.tar.bz2 | |
restore old behaviour of FindPulseAudio
Summary:
Commit ee5b036c1df4776a258c0d8067fd2eaf18875829 added a new FindPulseAudio module with a slightly different syntax than the old one. Since the old module was removed with commit 7574022825804db2274bba992d6fc4a4817c1536 plasma-desktop and plasma-pa are broken. Just adding the old syntax as synonym for fixing this.
See also https://bugs.kde.org/show_bug.cgi?id=386659
Test Plan: compile tested with plasma-desktop
Reviewers: #frameworks, cgiboudeaux
Reviewed By: cgiboudeaux
Subscribers: jriddell, ngraham, rikmills, cgiboudeaux, #build_system
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D8777
| -rw-r--r-- | find-modules/FindPulseAudio.cmake | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/find-modules/FindPulseAudio.cmake b/find-modules/FindPulseAudio.cmake index 0858eb79..6a5bd563 100644 --- a/find-modules/FindPulseAudio.cmake +++ b/find-modules/FindPulseAudio.cmake @@ -102,15 +102,17 @@ if (PulseAudio_INCLUDE_DIRS AND NOT PulseAudio_VERSION) set(PulseAudio_VERSION "${_PulseAudio_VERSION}" CACHE STRING "Version number of PulseAudio" FORCE) endif() -# Deprecated synonyms -set(PulseAudio_INCLUDE_DIR "${PulseAudio_INCLUDE_DIRS}") -set(PulseAudio_LIBRARY "${PulseAudio_LIBRARIES}") - # Use the new extended syntax of find_package_handle_standard_args(), which also handles version checking: include(FindPackageHandleStandardArgs) find_package_handle_standard_args(PulseAudio REQUIRED_VARS PulseAudio_LIBRARIES PulseAudio_INCLUDE_DIRS VERSION_VAR PulseAudio_VERSION) +# Deprecated synonyms +set(PULSEAUDIO_INCLUDE_DIR "${PulseAudio_INCLUDE_DIRS}") +set(PULSEAUDIO_LIBRARY "${PulseAudio_LIBRARIES}") +set(PULSEAUDIO_MAINLOOP_LIBRARY "${PulseAudio_MAINLOOP_LIBRARY}") +set(PULSEAUDIO_FOUND "${PulseAudio_FOUND}") + if(PulseAudio_FOUND AND NOT TARGET PulseAudio::PulseAudio) add_library(PulseAudio::PulseAudio UNKNOWN IMPORTED) set_target_properties(PulseAudio::PulseAudio PROPERTIES @@ -118,9 +120,9 @@ if(PulseAudio_FOUND AND NOT TARGET PulseAudio::PulseAudio) INTERFACE_INCLUDE_DIRECTORIES "${PulseAudio_INCLUDE_DIRS}") endif() -mark_as_advanced(PulseAudio_INCLUDE_DIRS PulseAudio_INCLUDE_DIR - PulseAudio_LIBRARIES PulseAudio_LIBRARY - PulseAudio_MAINLOOP_LIBRARY) +mark_as_advanced(PulseAudio_INCLUDE_DIRS PULSEAUDIO_INCLUDE_DIR + PulseAudio_LIBRARIES PULSEAUDIO_LIBRARY + PulseAudio_MAINLOOP_LIBRARY PULSEAUDIO_MAINLOOP_LIBRARY) set_package_properties(PulseAudio PROPERTIES URL "https://www.freedesktop.org/wiki/Software/PulseAudio" DESCRIPTION "Sound server, for sound stream routing and mixing") |