diff options
| author | h.udo <hudokkow@gmail.com> | 2016-12-11 18:26:06 +0000 |
|---|---|---|
| committer | h.udo <hudokkow@gmail.com> | 2016-12-11 22:08:40 +0000 |
| commit | 75c91a4561c663e6e4a3d5e9d9995a9cbb81b12e (patch) | |
| tree | dc250fa6c0c4a8d987c53fcf38a6658856ec1413 /project | |
| parent | eaaf68e787cc506423f2270063bf71094ad3c204 (diff) | |
[backport/PR11137][cmake] Add support for Bluetooth
Diffstat (limited to 'project')
| -rw-r--r-- | project/cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | project/cmake/modules/FindBluetooth.cmake | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt index a8787b31e8..5e19343d8e 100644 --- a/project/cmake/CMakeLists.txt +++ b/project/cmake/CMakeLists.txt @@ -118,7 +118,7 @@ endif() # Optional dependencies set(optional_deps MicroHttpd MySqlClient SSH XSLT Alsa UDEV DBus Avahi SmbClient - PulseAudio VDPAU VAAPI) + PulseAudio VDPAU VAAPI Bluetooth) # Required, dyloaded deps set(required_dyload Curl ASS) diff --git a/project/cmake/modules/FindBluetooth.cmake b/project/cmake/modules/FindBluetooth.cmake index 538e89c422..a69980dc74 100644 --- a/project/cmake/modules/FindBluetooth.cmake +++ b/project/cmake/modules/FindBluetooth.cmake @@ -14,12 +14,12 @@ # Bluetooth::Bluetooth - The Bluetooth library if(PKG_CONFIG_FOUND) - pkg_check_modules(PC_BLUETOOTH bluetooth QUIET) + pkg_check_modules(PC_BLUETOOTH bluez bluetooth QUIET) endif() find_path(BLUETOOTH_INCLUDE_DIR NAMES bluetooth/bluetooth.h PATHS ${PC_BLUETOOTH_INCLUDEDIR}) -find_library(BLUETOOTH_LIBRARY NAMES bluetooth +find_library(BLUETOOTH_LIBRARY NAMES bluetooth libbluetooth PATHS ${PC_BLUETOOTH_LIBDIR}) set(BLUETOOTH_VERSION ${PC_BLUETOOTH_VERSION}) @@ -27,7 +27,7 @@ set(BLUETOOTH_VERSION ${PC_BLUETOOTH_VERSION}) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Bluetooth REQUIRED_VARS BLUETOOTH_LIBRARY BLUETOOTH_INCLUDE_DIR - VERSION_VAR ${BLUETOOTH_VERSION}) + VERSION_VAR BLUETOOTH_VERSION) if(BLUETOOTH_FOUND) set(BLUETOOTH_INCLUDE_DIRS ${BLUETOOTH_INCLUDE_DIR}) |