Merge pull request #129 from BluEye-Robotics/next

Update CMakeLists and model enum

.gitignore

@@ -30,3 +30,4 @@ out
 # Other
 build
 build_imx
+build_*

CMakeLists.txt

@@ -13,7 +13,21 @@ protobuf_generate_python(PROTO_PY ${ProtoFiles})
 
 add_library(blueyeprotocol SHARED ${ProtoSources} ${ProtoHeaders})
 
-target_link_libraries(blueyeprotocol PUBLIC ${PROTOBUF_LIBRARIES})
+set(EXT_LIBS
+  ${PROTOBUF_LIBRARIES}
+)
+
+# For protobuf linking. Should rather user find_package(protobuf CONFIG REQUIRED) but that fails in yocto
+find_package(absl QUIET)
+
+if(absl_FOUND)
+  list(APPEND EXT_LIBS
+    absl::log_internal_message
+    absl::log_internal_check_op
+  )
+endif()
+
+target_link_libraries(blueyeprotocol PUBLIC ${EXT_LIBS})
 target_include_directories(blueyeprotocol PUBLIC ${PROTOBUF_INCLUDE_DIRS})
 
 install(TARGETS blueyeprotocol

cmake/blueyeprotocolConfig.cmake.in

@@ -4,4 +4,10 @@ set_and_check(blueyeprotocol_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
 set_and_check(blueyeprotocol_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")
 set_and_check(blueyeprotocol_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@")
 set_and_check(blueyeprotocol_LIB_DIRS "@PACKAGE_LIB_INSTALL_DIR@")
-set(blueyeprotocol_LIBRARIES blueyeprotocol)
+set(blueyeprotocol_LIBRARIES blueyeprotocol)
+
+find_package(absl QUIET)
+
+if(absl_FOUND)
+    link_libraries(absl::log_internal_message absl::log_internal_check_op)
+endif()

protobuf_definitions/message_formats.proto

@@ -436,6 +436,7 @@ enum Model {
   MODEL_PRO = 2; // Blueye Pro, features camera tilt
   MODEL_X1 = 4; // Blueye X1, features camera tilt and one guest port
   MODEL_X3 = 3; // Blueye X3, features support for peripherals
+  MODEL_X3_ULTRA = 6; // Blueye X3 Ultra
   MODEL_NEXT = 5; // Blueye ?
 }