diff options
author | Sven Gothel <[email protected]> | 2021-08-31 04:41:54 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2021-08-31 04:41:54 +0200 |
commit | aef10f3cdec0fd698cfa7d913725b40d1513ce30 (patch) | |
tree | e36d6b2796e40c5d4f40e66d9cbb6b7259bd42f6 /CMakeLists.txt | |
parent | 99ddbcee148144b3593adf4440d3fa3d06f229ab (diff) |
Direct-BT: Remove TinyB and Cleanup Java API (1)
Starting with version 2.3, the previously refactored *TinyB* has been removed completely.
Motivation was lack of detailed Bluetooth support, inclusive increasing diversion with *Direct-BT*.
Furthermore, work is underway for `BLE slave periphal and GATT server` support and its mapping to *BlueZ D-Bus* is questionable
and would be resource intensive.
Java API changed as follows:
- Objects no more Clonable
- Removed dead unsupported code
- Removed deprecated code
- Added 'GattCharPropertySet', representing property bit mask for BTGattChar,
replacing the string array.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 28c81700..5dd5a710 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,13 +9,6 @@ endif() FIND_PACKAGE (Threads REQUIRED) -if(NOT SKIP_TINYB) - FIND_PACKAGE (PkgConfig REQUIRED) - PKG_CHECK_MODULES (GLIB2 REQUIRED glib-2.0>=2.40) - PKG_CHECK_MODULES (GIO REQUIRED gio-2.0>=2.40) - PKG_CHECK_MODULES (GIO-UNIX REQUIRED gio-unix-2.0>=2.40) -endif() - # set(CMAKE_MESSAGE_LOG_LEVEL DEBUG) include(jaulib/JaulibSetup.cmake) @@ -30,11 +23,6 @@ set (direct_bt_VERSION_MINOR ${VERSION_MINOR}) set (direct_bt_VERSION_PATCH ${VERSION_PATCH}) set (direct_bt_VERSION_STRING "${direct_bt_VERSION_MAJOR}.${direct_bt_VERSION_MINOR}.${direct_bt_VERSION_PATCH}") -set (tinyb_VERSION_MAJOR ${VERSION_MAJOR}) -set (tinyb_VERSION_MINOR ${VERSION_MINOR}) -set (tinyb_VERSION_PATCH ${VERSION_PATCH}) -set (tinyb_VERSION_STRING "${tinyb_VERSION_MAJOR}.${tinyb_VERSION_MINOR}.${tinyb_VERSION_PATCH}") - set (CMAKE_SWIG_FLAGS "") set (direct_bt_DOCS_DIR documentation) @@ -46,16 +34,11 @@ add_subdirectory (jaulib) add_subdirectory (src/direct_bt) -if(NOT SKIP_TINYB) - add_subdirectory (src/tinyb) -endif() - option (BUILDJAVA "Build Java API." OFF) IF(BUILDJAVA) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/java/manifest.txt.in ${CMAKE_CURRENT_BINARY_DIR}/java/manifest.txt) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/java_fat/manifest-fat.txt.in ${CMAKE_CURRENT_BINARY_DIR}/java_fat/manifest-fat.txt) - configure_file (${CMAKE_CURRENT_SOURCE_DIR}/java_fat/manifest-fat2.txt.in ${CMAKE_CURRENT_BINARY_DIR}/java_fat/manifest-fat2.txt) add_subdirectory (java) add_subdirectory (java_fat) ENDIF(BUILDJAVA) @@ -70,7 +53,7 @@ if (DOXYGEN_FOUND) COMMAND ${CMAKE_COMMAND} -E make_directory ${direct_bt_DOCS_DIR} COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.cpp.out COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.java.out - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/api/tinyb/*.hpp ${CMAKE_CURRENT_SOURCE_DIR}/api/direct_bt/*.hpp ${CMAKE_CURRENT_SOURCE_DIR}/java/org/direct_bt/*.java ${CMAKE_CURRENT_SOURCE_DIR}/java/tinyb/dbus/*java ${CMAKE_CURRENT_SOURCE_DIR}/java/jau/direct_bt/*java + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/api/direct_bt/*.hpp ${CMAKE_CURRENT_SOURCE_DIR}/java/org/direct_bt/*.java ${CMAKE_CURRENT_SOURCE_DIR}/java/jau/direct_bt/*java WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating API documentation with Doxygen" VERBATIM ) |