diff --git a/README b/README index 4f8f45d09f7e0e167d19d41a5a347560685b94f9..62c019c4f8544163533c1ae372e427ec7ad521a9 100644 --- a/README +++ b/README @@ -40,7 +40,7 @@ lib: daemon: - libev - - msgpack + - msgpack-cxx - cxxopts - ksql - libucl @@ -59,18 +59,18 @@ bluecontrol: Kernel patches All kernel patches needed to build blued can be found in the -kernel_patches directory. Testing performed up to this point has been -performed on the 12 series of FreeBSD. Most recently FreeBSD 12.3. +kernel_patches directory. Testing and development is currently +targeting FreeBSD 13.2. Assuming you have the source code checked out under /usr/src with git, the following command sequence checks out the correct branch and applies the patch: cd /usr/src - git checkout releng/12.3 + git checkout releng/13.2 git apply < /path/to/blued/kernel_patches/secure_simple_pairing.patch -If you are running FreeBSD 12.3, it is enough to copy +If you are running FreeBSD 13.2, it is enough to copy the patched sys/netgraph/bluetooth/include/ng_hci.h from the source tree to /usr/include/netgraph/bluetooth/include/ng_hci.h in the system and building and installing the ng_hci module. diff --git a/bluecontrol/CMakeLists.txt b/bluecontrol/CMakeLists.txt index 4734e075c1bfc64c8045ac45b4fdb16533a69b07..afbd8e1edd58d27d4dea0ce7d4cbac1afe21bb5b 100644 --- a/bluecontrol/CMakeLists.txt +++ b/bluecontrol/CMakeLists.txt @@ -1,14 +1,14 @@ include(FindPkgConfig) pkg_check_modules(EV REQUIRED libev) -find_package(msgpack REQUIRED) +find_package(msgpack-cxx REQUIRED) find_package(cxxopts REQUIRED) add_executable(bluecontrol src/main.cpp src/bluecontrol.cpp) target_link_libraries(bluecontrol - msgpackc-cxx cxxopts::cxxopts ${EV_LINK_LIBRARIES} + msgpack-cxx ) set_property(TARGET bluecontrol PROPERTY CXX_STANDARD 17) target_include_directories(bluecontrol PRIVATE api) diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt index 6944981465d571758119fe716573b2247c4174c7..5d84b6a8d7de5724a24b8b54378b413ce44a9f59 100644 --- a/daemon/CMakeLists.txt +++ b/daemon/CMakeLists.txt @@ -2,7 +2,7 @@ include(FindPkgConfig) pkg_check_modules(EV REQUIRED libev) pkg_check_modules(UCL REQUIRED libucl) -find_package(msgpack REQUIRED) +find_package(msgpack-cxx REQUIRED) find_package(SQLite3 REQUIRED) find_library(ksql ksql REQUIRED) find_package(cxxopts REQUIRED) @@ -15,14 +15,14 @@ add_executable(blued src/hid_daemon.cpp ) target_link_libraries(blued - blue ${EV_LINK_LIBRARIES} ${UCL_LINK_LIBRARIES} - msgpackc-cxx - SQLite::SQLite3 ${ksql} - cxxopts::cxxopts + SQLite::SQLite3 + blue casper + cxxopts::cxxopts + msgpack-cxx util ) target_include_directories(blued PRIVATE