Merge pull request #3163 from robotology/swig_421_fix

fix for c# with swig version 4.2.1
robotology · Jan 21, 2025 · 9bcb705 · 9bcb705
2 parents e5e3fa3 + d4b13b5
commit 9bcb705
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1434,6 +1434,7 @@ jobs:
           set(_cmake_extra_options ${{ matrix.config.cmake_extra_options }})
         endif()
 
+        #SWIGFIX temporary fix for swig 4.2.1. The following lines should be removed.
         set(_swig_extra_options)
         if(NOT "${{ matrix.config.swig_extra_options }}" STREQUAL "")
           set(_swig_extra_options ${{ matrix.config.swig_extra_options }})
@@ -1592,6 +1593,12 @@ jobs:
                                        -D CMAKE_CXX_COMPILER_LAUNCHER=${_ccache_cmd})
         endif()
 
+        #SWIGFIX temporary fix for swig 4.2.1. The following lines should be removed.
+        set(_swig_extra_options)
+        if(NOT "${{ matrix.config.swig_extra_options }}" STREQUAL "")
+          set(_swig_extra_options ${{ matrix.config.swig_extra_options }})
+        endif()
+
         execute_process_x(
           COMMAND ${CMAKE_COMMAND}
             -S bindings
@@ -1669,6 +1676,12 @@ jobs:
                                        -D CMAKE_CXX_COMPILER_LAUNCHER=${_ccache_cmd})
         endif()
 
+        #SWIGFIX temporary fix for swig 4.2.1. The following lines should be removed.
+        set(_swig_extra_options)
+        if(NOT "${{ matrix.config.swig_extra_options }}" STREQUAL "")
+          set(_swig_extra_options ${{ matrix.config.swig_extra_options }})
+        endif()
+
         execute_process_x(
           COMMAND ${CMAKE_COMMAND}
             -S bindings

diff --git a/bindings/yarp.i b/bindings/yarp.i
@@ -451,9 +451,11 @@ MAKE_COMMS(Bottle)
   %include "matlab/vectors_fromTo_matlab.i"
 #endif
 
+#if SWIG_VERSION < 0x040201
 #if defined(SWIGCSHARP)
   SWIG_STD_VECTOR_SPECIALIZE_MINIMUM(Pid,yarp::dev::Pid)
 #endif
+#endif
 %template(PidVector) std::vector<yarp::dev::Pid>;
 
 //////////////////////////////////////////////////////////////////////////