Bump third_party/libsbp from 84f224f to 1bfe255

src/CMakeLists.txt

@@ -15,6 +15,10 @@ add_library(settings
             setting_type_float.c
             setting_type_int.c
             setting_type_str.c)
+target_compile_options(settings
+  PRIVATE
+    -Wno-error=deprecated-declarations
+)
 
 target_link_libraries(settings swiftnav)
 

src/setting_sbp_cb.c

@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <libsbp/settings.h>
+#include <libsbp/legacy/settings.h>
 
 #include <swiftnav/logging.h>
 
@@ -26,6 +26,8 @@
 #include <internal/setting_macros.h>
 #include <internal/setting_sbp_cb.h>
 
+#define SBP_SENDER_ID 0x42
+
 #define UPDATE_FILTER_NONE 0x0
 #define UPDATE_FILTER_BASIC (0x1 << 3)
 #define UPDATE_FILTER_READONLY (0x1 << 1)

src/settings.c

@@ -75,8 +75,8 @@
 #include <string.h>
 #include <sys/stat.h>
 
+#include <libsbp/legacy/settings.h>
 #include <libsbp/sbp.h>
-#include <libsbp/settings.h>
 
 #include <swiftnav/logging.h>
 
@@ -98,6 +98,8 @@
 #define __attribute__(x)
 #endif
 
+#define SBP_SENDER_ID 0x42
+
 #define REGISTER_TIMEOUT_MS 500
 #define REGISTER_TRIES 5
 

tests/CMakeLists.txt

@@ -1,4 +1,4 @@
-  add_executable(
+add_executable(
     test_libsettings
     src/test_request_state.cpp
     src/test_setting_data.cpp
@@ -20,28 +20,29 @@
     ${PROJECT_SOURCE_DIR}/src/settings.c
     ${PROJECT_SOURCE_DIR}/src/settings_util.c)
 
-  target_include_directories(test_libsettings
+target_include_directories(test_libsettings
       PRIVATE
       ${PROJECT_SOURCE_DIR}/include
       ${PROJECT_SOURCE_DIR}/tests/include
       $<TARGET_PROPERTY:sbp,INCLUDE_DIRECTORIES>
       )
 
-  target_link_libraries(test_libsettings swiftnav gtest_main)
+target_link_libraries(test_libsettings swiftnav gtest_main)
+target_compile_options(test_libsettings PRIVATE -Wno-error=deprecated-declarations)
 
-  if (WIN32)
-    add_custom_command(
+if (WIN32)
+  add_custom_command(
       TARGET test_libsettings POST_BUILD
       COMMENT "Running unit tests"
       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/bin/libgtest.dll ${CMAKE_BINARY_DIR}/tests
       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/bin/libgtest_main.dll ${CMAKE_BINARY_DIR}/tests
       COMMAND test_libsettings
     )
-  else (WIN32)
-    add_custom_command(
+else (WIN32)
+  add_custom_command(
       TARGET test_libsettings POST_BUILD
       COMMENT "Running unit tests"
       COMMAND test_libsettings
     )
-  endif (WIN32)
+endif (WIN32)