Skip to content

Commit

Permalink
switch to the latest add_cyphal_library on Nunavut
Browse files Browse the repository at this point in the history
  • Loading branch information
serges147 committed Dec 27, 2024
1 parent 94fb76d commit 8979697
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
submodules: true
submodules: recursive
- run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
submodules: true
submodules: recursive
- run: |
sudo apt update -y && sudo apt upgrade -y
sudo apt install gcc-multilib g++-multilib ninja-build
Expand Down
6 changes: 0 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@
path = submodules/nunavut
url = https://github.com/OpenCyphal/nunavut.git
branch = 3.0.preview
[submodule "submodules/pydsdl"]
path = submodules/pydsdl
url = https://github.com/OpenCyphal/pydsdl.git
[submodule "submodules/public_regulated_data_types"]
path = submodules/public_regulated_data_types
url = https://github.com/UAVCAN/public_regulated_data_types
[submodule "submodules/cetl"]
path = submodules/cetl
url = https://github.com/OpenCyphal/CETL.git
11 changes: 5 additions & 6 deletions src/daemon/engine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ find_package("Nunavut" 3.0 REQUIRED)
# Define type generation and header library all in one go.
#
set(dsdl_types_in_engine # List all the DSDL types used in the engine
${submodules_dir}/public_regulated_data_types/uavcan:node/430.GetInfo.1.0.dsdl
${submodules_dir}/public_regulated_data_types/uavcan:node/435.ExecuteCommand.1.3.dsdl
${submodules_dir}/public_regulated_data_types/uavcan:node/7509.Heartbeat.1.0.dsdl
${submodules_dir}/public_regulated_data_types/uavcan:register/384.Access.1.0.dsdl
${submodules_dir}/public_regulated_data_types/uavcan:register/385.List.1.0.dsdl
uavcan/node/430.GetInfo.1.0.dsdl
uavcan/node/435.ExecuteCommand.1.3.dsdl
uavcan/node/7509.Heartbeat.1.0.dsdl
uavcan/register/384.Access.1.0.dsdl
uavcan/register/385.List.1.0.dsdl
)
add_cyphal_library(
NAME engine
Expand All @@ -25,7 +25,6 @@ add_cyphal_library(
LANGUAGE cpp
LANGUAGE_STANDARD cetl++14-17
OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/dsdl_transpiled
PYDSDL_PATH ${submodules_dir}/pydsdl
OUT_LIBRARY_TARGET dsdl_transpiled_headers
)

Expand Down
1 change: 0 additions & 1 deletion submodules/public_regulated_data_types
Submodule public_regulated_data_types deleted from f9f679
1 change: 0 additions & 1 deletion submodules/pydsdl
Submodule pydsdl deleted from 97fb20

0 comments on commit 8979697

Please sign in to comment.