Merge pull request #3108 from traversaro/fixswigdirportmonitor

Do not ignore ${SWIG_DIR} when invoking ${SWIG_EXECUTABLE}
robotology · Jun 3, 2024 · e8ddfd3 · e8ddfd3
2 parents 2c1ff12 + b2fae80
commit e8ddfd3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/doc/release/master.md b/doc/release/master.md
@@ -29,6 +29,7 @@ Fixes
 
 * Configuration files installed by the `yarp_configure_plugins_installation` CMake macro are now relocatable (https://github.com/robotology/yarp/issues/2445, ).
 * Improved `ffmpeg` port monitor to allow using different couples of coders/decodes
+* Fixed compilation of portmonitor carrier when a custom non-system swig is used
 * Fixed compatibility with ffmpeg 7 (https://github.com/robotology/yarp/pull/3109).
 
 New Features

diff --git a/src/carriers/portmonitor_carrier/CMakeLists.txt b/src/carriers/portmonitor_carrier/CMakeLists.txt
@@ -36,7 +36,7 @@ if (NOT SKIP_portmonitor)
       add_custom_command(
         OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/lua/src_gen/swigluarun.h"
         COMMAND "${CMAKE_COMMAND}" -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/lua/src_gen/"
-        COMMAND "${SWIG_EXECUTABLE}" -c++ -lua -external-runtime "${CMAKE_CURRENT_BINARY_DIR}/lua/src_gen/swigluarun.h"
+        COMMAND "${CMAKE_COMMAND}" -E env "SWIG_LIB=${SWIG_DIR}" "${SWIG_EXECUTABLE}" -c++ -lua -external-runtime "${CMAKE_CURRENT_BINARY_DIR}/lua/src_gen/swigluarun.h"
         COMMENT "Generating swig-lua runtime"
       )
       target_include_directories(yarp_portmonitor PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/lua/src_gen")