Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cpp/forge_msgs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.20)

project(forge_msgs_cpp VERSION 1.3.0 LANGUAGES CXX)
project(forge_msgs_cpp VERSION 1.3.1 LANGUAGES CXX)

set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
Expand Down
35 changes: 19 additions & 16 deletions cpp/forge_robot/cmake/Dora041Targets.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,26 @@ set(operator_bridge "${CMAKE_CURRENT_BINARY_DIR}/operator_bridge.cc")
set(dora_bridge_copy_script "${CMAKE_CURRENT_BINARY_DIR}/copy_dora041_bridges.cmake")

file(WRITE ${dora_bridge_copy_script} [=[
file(GLOB node_bridge_sources "${DORA_TARGET_DIR}/debug/build/dora-node-api-cxx-*/out/cxxbridge/sources/dora-node-api-cxx/src/lib.rs.cc")
file(GLOB node_bridge_headers "${DORA_TARGET_DIR}/debug/build/dora-node-api-cxx-*/out/cxxbridge/include/dora-node-api-cxx/src/lib.rs.h")
file(GLOB operator_bridge_sources "${DORA_TARGET_DIR}/debug/build/dora-operator-api-cxx-*/out/cxxbridge/sources/dora-operator-api-cxx/src/lib.rs.cc")
file(GLOB operator_bridge_headers "${DORA_TARGET_DIR}/debug/build/dora-operator-api-cxx-*/out/cxxbridge/include/dora-operator-api-cxx/src/lib.rs.h")
# Dora v0.4.1 exposes the generated files here independently of Cargo's
# build-script directory layout. Older builds may only have OUT_DIR copies.
function(find_bridge_file output package directory extension)
set(exported "${DORA_TARGET_DIR}/cxxbridge/${package}/src/lib.rs.${extension}")
if(EXISTS "${exported}")
set(${output} "${exported}" PARENT_SCOPE)
return()
endif()
file(GLOB candidates "${DORA_TARGET_DIR}/debug/build/${package}-*/out/cxxbridge/${directory}/${package}/src/lib.rs.${extension}")
if(NOT candidates)
message(FATAL_ERROR "Could not find ${package} lib.rs.${extension} in ${DORA_TARGET_DIR}")
endif()
list(GET candidates 0 selected)
set(${output} "${selected}" PARENT_SCOPE)
endfunction()

list(LENGTH node_bridge_sources node_bridge_source_count)
list(LENGTH node_bridge_headers node_bridge_header_count)
list(LENGTH operator_bridge_sources operator_bridge_source_count)
list(LENGTH operator_bridge_headers operator_bridge_header_count)
if(node_bridge_source_count EQUAL 0 OR node_bridge_header_count EQUAL 0 OR operator_bridge_source_count EQUAL 0 OR operator_bridge_header_count EQUAL 0)
message(FATAL_ERROR "Could not find Dora v0.4.1 CXX bridge outputs in ${DORA_TARGET_DIR}")
endif()

list(GET node_bridge_sources 0 node_bridge_source)
list(GET node_bridge_headers 0 node_bridge_header)
list(GET operator_bridge_sources 0 operator_bridge_source)
list(GET operator_bridge_headers 0 operator_bridge_header)
find_bridge_file(node_bridge_source dora-node-api-cxx sources cc)
find_bridge_file(node_bridge_header dora-node-api-cxx include h)
find_bridge_file(operator_bridge_source dora-operator-api-cxx sources cc)
find_bridge_file(operator_bridge_header dora-operator-api-cxx include h)

file(MAKE_DIRECTORY "${DORA_CXX_INCLUDE_DIR}")
file(MAKE_DIRECTORY "${DORA_C_INCLUDE_DIR}")
Expand Down
2 changes: 1 addition & 1 deletion crates/forge_msgs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "forge_msgs"
version = "1.3.0"
version = "1.3.1"
edition.workspace = true
license.workspace = true
authors.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions packages/msgs/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "forge-msgs"
version = "1.3.0"
version = "1.3.1"
description = "Python message models and Arrow serialization for Forge robotics dataflows."
readme = "README.md"
authors = [
Expand All @@ -11,7 +11,7 @@ license = "Apache-2.0"
license-files = ["LICENSE"]
dependencies = [
"numpy>=1.26,<3",
"pillow>=10,<13",
"pillow>=10,<14",
"pyarrow>=14,<24",
"pydantic>=2.0,<3",
]
Expand Down
Loading
Loading