diff options
| author | Cristiano A. Silva <hudokkow@gmail.com> | 2016-12-12 10:46:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 10:46:22 +0000 |
| commit | 997bd7035cc3201ed7ee0c9086c6d9fc8db81915 (patch) | |
| tree | ebadc3990c51210c7c7ea4c1462f500ec78f96bb /project | |
| parent | 30d903c9b1b317047b0ccb7ad0965283129c45c8 (diff) | |
| parent | 4a130b64c8d514424a2a7efa1414ccf41569e96b (diff) | |
Merge pull request #11137 from hudokkow/cmake_bluetooth
[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 c9470af923..5dd9ca9489 100644 --- a/project/cmake/CMakeLists.txt +++ b/project/cmake/CMakeLists.txt @@ -119,7 +119,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}) |