From 08a2ca0bbeb1bc33822df6ed85fae71efce9a033 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 26 Feb 2024 20:23:35 +0100 Subject: [PATCH 1/3] Enable rmw_cyclonedds_cpp package on Windows --- vinca_win.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/vinca_win.yaml b/vinca_win.yaml index 2694c05c..467f1e5b 100644 --- a/vinca_win.yaml +++ b/vinca_win.yaml @@ -18,16 +18,11 @@ full_rebuild: true packages_skip_by_deps: - cartographer - octomap - - iceoryx_utils - - iceoryx_binding_c - - iceoryx_posh - - cyclonedds - rttest packages_remove_from_deps: - cartographer - octomap - - rmw_cyclonedds_cpp - tlsf - tlsf_cpp - pendulum_control @@ -46,6 +41,7 @@ packages_select_by_deps: - vision_msgs - ros_environment - ros_base + - rmw_cyclonedds_cpp # - navigation2 # - desktop # - cv_bridge From 13bd3a4b57f79c4279aa22f12f7768553f99b62c Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 26 Feb 2024 20:33:34 +0100 Subject: [PATCH 2/3] Update vinca_win.yaml --- vinca_win.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vinca_win.yaml b/vinca_win.yaml index 467f1e5b..0963c57c 100644 --- a/vinca_win.yaml +++ b/vinca_win.yaml @@ -34,8 +34,8 @@ skip_existing: packages_select_by_deps: - ament-cmake-core - - ros2_control - - ros2_controllers + #- ros2_control + #- ros2_controllers - backward_ros - ros_workspace - vision_msgs From 50a9fdf07bc78da4baedd087c3986495a0fd1f8c Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 26 Feb 2024 22:22:18 +0100 Subject: [PATCH 3/3] Force static compilation for iceoryx --- patch/ros-humble-iceoryx-binding-c.win.patch | 15 +++++++++++++++ patch/ros-humble-iceoryx-dds.win.patch | 15 +++++++++++++++ patch/ros-humble-iceoryx-hoofs.win.patch | 15 +++++++++++++++ patch/ros-humble-iceoryx-posh.win.patch | 15 +++++++++++++++ 4 files changed, 60 insertions(+) create mode 100644 patch/ros-humble-iceoryx-binding-c.win.patch create mode 100644 patch/ros-humble-iceoryx-dds.win.patch create mode 100644 patch/ros-humble-iceoryx-hoofs.win.patch create mode 100644 patch/ros-humble-iceoryx-posh.win.patch diff --git a/patch/ros-humble-iceoryx-binding-c.win.patch b/patch/ros-humble-iceoryx-binding-c.win.patch new file mode 100644 index 00000000..afdab9d5 --- /dev/null +++ b/patch/ros-humble-iceoryx-binding-c.win.patch @@ -0,0 +1,15 @@ +diff --git a/iceoryx_binding_c/CMakeLists.txt b/iceoryx_binding_c/CMakeLists.txt +index 048a6ea5a..78ff815fa 100644 +--- a/iceoryx_binding_c/CMakeLists.txt ++++ b/iceoryx_binding_c/CMakeLists.txt +@@ -16,6 +16,10 @@ + # SPDX-License-Identifier: Apache-2.0 + cmake_minimum_required(VERSION 3.16) + ++if(WIN32) ++ set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE) ++endif() ++ + set(IOX_VERSION_STRING "2.0.5") + + diff --git a/patch/ros-humble-iceoryx-dds.win.patch b/patch/ros-humble-iceoryx-dds.win.patch new file mode 100644 index 00000000..78ee8b6d --- /dev/null +++ b/patch/ros-humble-iceoryx-dds.win.patch @@ -0,0 +1,15 @@ +diff --git a/iceoryx_dds/CMakeLists.txt b/iceoryx_dds/CMakeLists.txt +index ae1f9f83f..e79873a72 100644 +--- a/iceoryx_dds/CMakeLists.txt ++++ b/iceoryx_dds/CMakeLists.txt +@@ -16,6 +16,10 @@ + # SPDX-License-Identifier: Apache-2.0 + cmake_minimum_required(VERSION 3.16) + ++if(WIN32) ++ set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE) ++endif() ++ + set(IOX_VERSION_STRING "2.0.5") + + project(iceoryx_dds VERSION ${IOX_VERSION_STRING}) diff --git a/patch/ros-humble-iceoryx-hoofs.win.patch b/patch/ros-humble-iceoryx-hoofs.win.patch new file mode 100644 index 00000000..cec97721 --- /dev/null +++ b/patch/ros-humble-iceoryx-hoofs.win.patch @@ -0,0 +1,15 @@ +diff --git a/iceoryx_hoofs/CMakeLists.txt b/iceoryx_hoofs/CMakeLists.txt +index 8afdbb5e8..cf66ba0ea 100644 +--- a/iceoryx_hoofs/CMakeLists.txt ++++ b/iceoryx_hoofs/CMakeLists.txt +@@ -17,6 +17,10 @@ + + cmake_minimum_required(VERSION 3.16) + ++if(WIN32) ++ set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE) ++endif() ++ + set(IOX_VERSION_STRING "2.0.5") + + project(iceoryx_hoofs VERSION ${IOX_VERSION_STRING}) diff --git a/patch/ros-humble-iceoryx-posh.win.patch b/patch/ros-humble-iceoryx-posh.win.patch new file mode 100644 index 00000000..0fc7347f --- /dev/null +++ b/patch/ros-humble-iceoryx-posh.win.patch @@ -0,0 +1,15 @@ +diff --git a/iceoryx_posh/CMakeLists.txt b/iceoryx_posh/CMakeLists.txt +index 57e84cdd0..d7781cbb9 100644 +--- a/iceoryx_posh/CMakeLists.txt ++++ b/iceoryx_posh/CMakeLists.txt +@@ -16,6 +16,10 @@ + # SPDX-License-Identifier: Apache-2.0 + cmake_minimum_required(VERSION 3.16) + ++if(WIN32) ++ set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE) ++endif() ++ + set(IOX_VERSION_STRING "2.0.5") + + project(iceoryx_posh VERSION ${IOX_VERSION_STRING})