Commit dd7094b4 authored by Harald Sitter's avatar Harald Sitter 🚔

port to ECM's FindCanberra

Summary:
- bump required kf5 version to 5.56
- use new VERSION var in FindCanberraPulse
- use new imported target when linking

Test Plan: cmake && make successful

Reviewers: apol

Reviewed By: apol

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D19382
parent 6d44d310
......@@ -6,7 +6,7 @@ set(PROJECT_VERSION "5.15.80")
set(PROJECT_VERSION_MAJOR 5)
set(QT_MIN_VERSION "5.11.0")
set(KF5_MIN_VERSION "5.54.0")
set(KF5_MIN_VERSION "5.56.0")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/ ${ECM_MODULE_PATH})
......
# - Find libcanberra's libraries and headers.
# This module defines the following variables:
#
# CANBERRA_FOUND - true if libcanberra was found
# CANBERRA_LIBRARIES - libcanberra libraries to link against
# CANBERRA_INCLUDE_DIRS - include path for libcanberra
# CANBERRA_VERSION - version of libcanberra
#
# Copyright (c) 2012 Raphael Kubo da Costa <rakuco@FreeBSD.org>
# Copyright (c) 2019 Harald Sitter <sitter@kde.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
find_package(PkgConfig)
pkg_check_modules(PC_CANBERRA libcanberra)
find_library(CANBERRA_LIBRARIES
NAMES canberra
HINTS ${PC_CANBERRA_LIBRARY_DIRS} ${PC_CANBERRA_LIBDIR}
)
find_path(CANBERRA_INCLUDE_DIRS
NAMES canberra.h
HINTS ${PC_CANBERRA_INCLUDE_DIRS} ${PC_CANBERRA_INCLUDEDIR}
)
set(CANBERRA_VERSION ${PC_CANBERRA_VERSION})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Canberra
REQUIRED_VARS CANBERRA_LIBRARIES CANBERRA_INCLUDE_DIRS
VERSION_VAR CANBERRA_VERSION
)
mark_as_advanced(CANBERRA_LIBRARIES CANBERRA_INCLUDE_DIRS CANBERRA_VERSION)
......@@ -32,7 +32,7 @@
find_package(Canberra)
find_library(CanberraPulse_LIBRARY canberra-pulse
PATH_SUFFIXES libcanberra libcanberra-${CANBERRA_VERSION}
PATH_SUFFIXES libcanberra libcanberra-${Canberra_VERSION}
)
include(FindPackageHandleStandardArgs)
......
......@@ -49,9 +49,9 @@ target_link_libraries(plasma-volume-declarative
Qt5::DBus
Qt5::Quick
KF5::GlobalAccel
Canberra::Canberra
${PULSEAUDIO_LIBRARY}
${PULSEAUDIO_MAINLOOP_LIBRARY}
${CANBERRA_LIBRARIES}
)
if (HAVE_GCONF)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment