From 721f9a7400d7c2aa31974f75337940b51b0e0f1a Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 24 Jan 2023 11:50:01 +0100 Subject: [PATCH 1/3] Update bld_catkin.bat.in --- vinca/templates/bld_catkin.bat.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/vinca/templates/bld_catkin.bat.in b/vinca/templates/bld_catkin.bat.in index 0934004..c373c47 100644 --- a/vinca/templates/bld_catkin.bat.in +++ b/vinca/templates/bld_catkin.bat.in @@ -6,6 +6,13 @@ set "PYTHONPATH=%LIBRARY_PREFIX%\lib\site-packages;%SP_DIR%" :: MSVC is preferred. set CC=cl.exe set CXX=cl.exe +https://learn.microsoft.com/en-us/cpp/build/reference/cl-environment-variables?view=msvc-170 +:: ROS_BUILD_SHARED_LIBS is always defined in CMake by catkin +:: if ROS (1) is build as shared library . However, some packages are not +:: passing compilation flags from CMake to other build systems (such as qmake), +:: so we enable it explicitly via the CL environment variable, see +:: https://learn.microsoft.com/en-us/cpp/build/reference/cl-environment-variables?view=msvc-170 +set CL=/DROS_BUILD_SHARED_LIBS=1 set "CATKIN_BUILD_BINARY_PACKAGE_ARGS=-DCATKIN_BUILD_BINARY_PACKAGE=1" if "%PKG_NAME%" == "ros-@(ros_distro)-catkin" ( From dff8f292d2cbac7f070b53103813da4e02d14f11 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 24 Jan 2023 11:50:45 +0100 Subject: [PATCH 2/3] Update bld_catkin.bat.in --- vinca/templates/bld_catkin.bat.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vinca/templates/bld_catkin.bat.in b/vinca/templates/bld_catkin.bat.in index c373c47..4c02c11 100644 --- a/vinca/templates/bld_catkin.bat.in +++ b/vinca/templates/bld_catkin.bat.in @@ -6,7 +6,7 @@ set "PYTHONPATH=%LIBRARY_PREFIX%\lib\site-packages;%SP_DIR%" :: MSVC is preferred. set CC=cl.exe set CXX=cl.exe -https://learn.microsoft.com/en-us/cpp/build/reference/cl-environment-variables?view=msvc-170 + :: ROS_BUILD_SHARED_LIBS is always defined in CMake by catkin :: if ROS (1) is build as shared library . However, some packages are not :: passing compilation flags from CMake to other build systems (such as qmake), From 7df81c2343ae057ded6821e7f5665bb296b6ac33 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 24 Jan 2023 11:53:06 +0100 Subject: [PATCH 3/3] Update bld_catkin_merge.bat.in --- vinca/templates/bld_catkin_merge.bat.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/vinca/templates/bld_catkin_merge.bat.in b/vinca/templates/bld_catkin_merge.bat.in index d420f37..6e5ace9 100644 --- a/vinca/templates/bld_catkin_merge.bat.in +++ b/vinca/templates/bld_catkin_merge.bat.in @@ -6,6 +6,13 @@ setlocal set CC=cl.exe set CXX=cl.exe +:: ROS_BUILD_SHARED_LIBS is always defined in CMake by catkin +:: if ROS (1) is build as shared library . However, some packages are not +:: passing compilation flags from CMake to other build systems (such as qmake), +:: so we enable it explicitly via the CL environment variable, see +:: https://learn.microsoft.com/en-us/cpp/build/reference/cl-environment-variables?view=msvc-170 +set CL=/DROS_BUILD_SHARED_LIBS=1 + set CATKIN_MAKE_ISOLATED=src\ros-@(ros_distro)-catkin\bin\catkin_make_isolated set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH:\=/%