Commit 348c8b5b authored by Heiko Becker's avatar Heiko Becker
Browse files

Remove our own copy of FindCanberra

extra-cmake-modules comes with one since 5.56.0 and we require 5.68.0
already.
parent b0d6b75b
......@@ -67,8 +67,6 @@ if (BUILD_DATAENGINE)
set_package_properties(KF5Plasma PROPERTIES PURPOSE "Required to build the Plasma dataengine")
endif ()
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
# PulseAudio is an optional dependency
find_package(PulseAudio "${PA_MIN_VERSION}")
......@@ -100,7 +98,6 @@ endif ()
if (CANBERRA_FOUND)
add_definitions(-DHAVE_CANBERRA)
include_directories(${CANBERRA_INCLUDE_DIRS})
endif ()
####################################################################################################
......@@ -219,7 +216,7 @@ endif ()
if (CANBERRA_FOUND)
# VolumeFeedback calls Canberra directly, so public linking is required
target_link_libraries(kmixcore PUBLIC ${CANBERRA_LIBRARIES})
target_link_libraries(kmixcore PUBLIC Canberra::Canberra)
endif ()
install(TARGETS kmixcore DESTINATION ${KDE_INSTALL_LIBDIR} LIBRARY NAMELINK_SKIP)
......
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 copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 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
#
# Copyright (c) 2012 Raphael Kubo da Costa <rakuco@FreeBSD.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
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}
)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Canberra REQUIRED_VARS CANBERRA_LIBRARIES CANBERRA_INCLUDE_DIRS)
mark_as_advanced(CANBERRA_LIBRARIES CANBERRA_INCLUDE_DIRS)
Supports Markdown
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