Skip to content

Commit

Permalink
[3rdparty] Make dependencies more flatpak-friendly
Browse files Browse the repository at this point in the history
  • Loading branch information
jcelerier committed Jul 1, 2024
1 parent c181434 commit d3f5cce
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 18 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
[submodule "3rdparty/ultraleap"]
path = 3rdparty/ultraleap
url = https://github.com/celtera/ultraleap
[submodule "3rdparty/SimpleBLE"]
path = 3rdparty/SimpleBLE
url = https://github.com/jcelerier/SimpleBLE
[submodule "3rdparty/bluetooth-numbers-database"]
path = 3rdparty/bluetooth-numbers-database
url = https://github.com/NordicSemiconductor/bluetooth-numbers-database/
1 change: 1 addition & 0 deletions 3rdparty/SimpleBLE
Submodule SimpleBLE added at 542cd8
1 change: 1 addition & 0 deletions 3rdparty/bluetooth-numbers-database
20 changes: 2 additions & 18 deletions ble.cmake
Original file line number Diff line number Diff line change
@@ -1,24 +1,8 @@
set(LIBFMT_VENDORIZE OFF)
set(SIMPLEBLE_INSTALL OFF)
FetchContent_Declare(
SimpleBLE
GIT_REPOSITORY "https://github.com/jcelerier/SimpleBLE"
GIT_TAG fix/cmake-usage-install-rules
GIT_PROGRESS true
SOURCE_SUBDIR simpleble
)

FetchContent_MakeAvailable(SimpleBLE)


FetchContent_Declare(
ble-database
GIT_REPOSITORY "https://github.com/NordicSemiconductor/bluetooth-numbers-database/"
GIT_TAG master
GIT_PROGRESS true
)
add_subdirectory(3rdparty/SimpleBLE/simpleble "${CMAKE_BINARY_DIR}/simpleble-build")

FetchContent_MakeAvailable(ble-database)
set(ble-database_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/bluetooth-numbers-database/")

set(BLE_SERVICE_UUIDS_JSON "${ble-database_SOURCE_DIR}/v1/service_uuids.json")
file(READ "${BLE_SERVICE_UUIDS_JSON}" BLE_SERVICE_UUIDS)
Expand Down

0 comments on commit d3f5cce

Please sign in to comment.