chore(orb-messages): update nanopb and use cmake helpers

to build orb-messages as library, added/linked into target from library itself use target defined in zephyr as dependency. Signed-off-by: Cyril Fougeray <[email protected]>
worldcoin · Dec 2, 2024 · b6a9d11 · b6a9d11
1 parent e817964
commit b6a9d11
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/main_board/CMakeLists.txt b/main_board/CMakeLists.txt
@@ -166,14 +166,7 @@ zephyr_include_directories(config)
 zephyr_linker_sources(SECTIONS config/compact-logs.ld)
 
 # link with Zephyr modules below
-# - modules/orb-protobuf-definitions: data format definitions and serializer/deserializer for messages between MCU, Jetson and Security MCU
 # - bootloader/mcuboot/boot/bootutil: public functions to access/modify mcuboot data from the application
-if (CONFIG_ORB_MCU_MESSAGING_LIB)
-    zephyr_link_libraries(ORB_MCU_MESSAGING_LIB)
-    # dependency below doesn't have to be forced if using West but must be added when using CMake only
-    # to build zephyr_final
-    add_dependencies(app generate_proto_files)
-endif ()
 if (CONFIG_MCUBOOT_BOOTUTIL_LIB)
     # check path is absolute
     if (IS_ABSOLUTE ${CONFIG_MCUBOOT_SIGNATURE_KEY_FILE})

diff --git a/west.yml b/west.yml
@@ -25,7 +25,7 @@ manifest:
       revision: 44de6d08fb329da43db9276866d51effc6595fcf
       path: modules/orb-messages/public
     - name: priv-orb-messages
-      revision: 24b1543547649818bc236ecb9a1ed5794b7f57d0
+      revision: 9fab6ea3cc3b80937725489318cf8d84c50e45b8
       path: modules/orb-messages
       groups: [internal]
     - name: plug-and-trust
@@ -38,4 +38,5 @@ manifest:
   # by default, only public projects are built
   # if access is granted, enable internal projects
   # with `west config manifest.group-filter +internal`
-  group-filter: [-internal]
+  # `optional` is used to fetch nanopb from the Zephyr west manifest
+  group-filter: [-internal, +optional]