From 14f77c45889a5ef1f0462b9f2a27b88fd03ba901 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Wed, 13 Mar 2024 13:15:59 -0700 Subject: [PATCH] need to compare ROS_DISTRO not ROS_PATH --- projects/default/controllers/ros/Makefile | 11 +++-------- .../vehicles/controllers/ros_automobile/Makefile | 13 +++++++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/projects/default/controllers/ros/Makefile b/projects/default/controllers/ros/Makefile index 91359841ac3..a63f5cc5d54 100644 --- a/projects/default/controllers/ros/Makefile +++ b/projects/default/controllers/ros/Makefile @@ -64,17 +64,12 @@ include/services/%.h: $(WEBOTS_HOME_PATH)/resources/webots_ros/srv/%.srv include @echo "# generating service header" $(notdir $<) $(SILENT)$(PYTHON_COMMAND) headersFromSRV.py $< -ifeq ($(ROS_PATH),noetic) +ifeq ($(ROS_DISTRO),noetic) INCLUDE = -isystem $(WEBOTS_HOME_PATH)/projects/default/controllers/ros/include -isystem /opt/ros/$(ROS_DISTRO)/include -else - INCLUDE = -isystem $(WEBOTS_HOME_PATH)/projects/default/controllers/ros/include -endif - -# include ros libraries - -ifeq ($(ROS_PATH),noetic) + # include ros libraries LIBRARIES += -L/opt/ros/$(ROS_DISTRO)/lib -Wl,-rpath-link=/opt/ros/$(ROS_DISTRO)/lib -lxmlrpcpp -lcpp_common -lrosconsole_backend_interface -lroscpp -lrosconsole -lrosconsole_log4cxx -lroscpp_serialization -lrostime -lcontroller_manager -lboost_system else + INCLUDE = -isystem $(WEBOTS_HOME_PATH)/projects/default/controllers/ros/include LIBRARIES += -W -lxmlrpcpp -lcpp_common -lrosconsole_backend_interface -lroscpp -lrosconsole -lrosconsole_log4cxx -lroscpp_serialization -lrostime -lboost_system endif diff --git a/projects/vehicles/controllers/ros_automobile/Makefile b/projects/vehicles/controllers/ros_automobile/Makefile index aeb07b889e5..073a4506df0 100644 --- a/projects/vehicles/controllers/ros_automobile/Makefile +++ b/projects/vehicles/controllers/ros_automobile/Makefile @@ -41,12 +41,17 @@ else ros_automobile: $(CXX_SOURCES:.cxx=.d) endif -INCLUDE = -I$(WEBOTS_HOME_PATH)/projects/default/controllers/ros -isystem $(WEBOTS_HOME_PATH)/projects/default/controllers/ros/include -LIBRARIES += -lCppDriver -lCppCar -ldriver -lcar +ifeq ($(ROS_DISTRO),noetic) + INCLUDE = -I$(WEBOTS_HOME_PATH)/projects/default/controllers/ros -isystem $(WEBOTS_HOME_PATH)/projects/default/controllers/ros/include -isystem /opt/ros/$(ROS_DISTRO)/include + # include ros libraries + LIBRARIES += -L/opt/ros/$(ROS_DISTRO)/lib -Wl,-rpath-link=/opt/ros/$(ROS_DISTRO)/lib -lxmlrpcpp -lcpp_common -lrosconsole_backend_interface -lroscpp -lrosconsole -lrosconsole_log4cxx -lroscpp_serialization -lrostime -lcontroller_manager -lboost_system +else + INCLUDE = -I$(WEBOTS_HOME_PATH)/projects/default/controllers/ros -isystem $(WEBOTS_HOME_PATH)/projects/default/controllers/ros/include + LIBRARIES += -W -lxmlrpcpp -lcpp_common -lrosconsole_backend_interface -lroscpp -lrosconsole -lrosconsole_log4cxx -lroscpp_serialization -lrostime -lboost_system # -lcontroller_manager +endif -# include ros libraries +LIBRARIES += -lCppDriver -lCppCar -ldriver -lcar -LIBRARIES += -W -lxmlrpcpp -lcpp_common -lrosconsole_backend_interface -lroscpp -lrosconsole -lrosconsole_log4cxx -lroscpp_serialization -lrostime -lboost_system # -lcontroller_manager ifeq ($(OSTYPE),windows) LIBRARIES += -lws2_32 ifeq ($(MAKECMDGOALS),debug)