Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

YARP 3 and Gazebo 9 cleanup #367

Merged
merged 3 commits into from
Jun 11, 2018
Merged

YARP 3 and Gazebo 9 cleanup #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
251ff24
Remove usage of YARP_INCLUDE_DIRS CMake variable
traversaro Jun 6, 2018
8e09d7b
yarp::os::ConstString ---> std::string
traversaro Jun 6, 2018
bb6ef7b
Fix Gazebo 9 deprecation
traversaro Jun 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set(${PROJECT_NAME}_VERSION
include(GNUInstallDirs)

# Finding dependencies
find_package(YARP 2.3.73.4 REQUIRED)
find_package(YARP 2.3.73.5 REQUIRED)
find_package(Boost REQUIRED serialization system)
find_package(Protobuf REQUIRED)
find_package(Gazebo REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion libraries/singleton/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include(AddGazeboYarpPluginTarget)

add_gazebo_yarp_plugin_target(LIBRARY_NAME singleton
INCLUDE_DIRS include/GazeboYarpPlugins
SYSTEM_INCLUDE_DIRS ${YARP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
SYSTEM_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
LINKED_LIBRARIES ${YARP_LIBRARIES} ${SDFORMAT_LIBRARIES} ${GAZEBO_LIBRARIES} ${PROTOBUF_LIBRARIES} ${Boost_LIBRARIES}
HEADERS include/GazeboYarpPlugins/Handler.hh
include/GazeboYarpPlugins/ConfHelpers.hh
Expand Down
2 changes: 1 addition & 1 deletion plugins/basestate/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ add_gazebo_yarp_plugin_target(LIBRARY_NAME basestate
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDE_DIRS include/gazebo
include/yarp/dev
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${YARP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
LINKED_LIBRARIES ${LIB_COMMON_NAME} gazebo_yarp_singleton ${YARP_LIBRARIES} ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES} ${SDFORMAT_LIBRARIES}
HEADERS include/gazebo/BaseState.hh
include/yarp/dev/BaseStateDriver.h
Expand Down
2 changes: 1 addition & 1 deletion plugins/camera/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ endif()

add_gazebo_yarp_plugin_target(LIBRARY_NAME camera
INCLUDE_DIRS include/gazebo include/yarp/dev
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${YARP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS} ${OGRE_INCLUDE_DIRS}
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS} ${OGRE_INCLUDE_DIRS}
LINKED_LIBRARIES ${LIB_COMMON_NAME} gazebo_yarp_singleton ${YARP_LIBRARIES} ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES} CameraPlugin
HEADERS include/gazebo/Camera.hh
include/yarp/dev/CameraDriver.h
Expand Down
2 changes: 1 addition & 1 deletion plugins/clock/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ endif()

add_gazebo_yarp_plugin_target(LIBRARY_NAME clock
INCLUDE_DIRS include/gazebo include/GazeboYarpPlugins
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${YARP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
LINKED_LIBRARIES gazebo_yarp_rpc_clock ${LIB_COMMON_NAME} ${YARP_LIBRARIES} ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES}
HEADERS include/gazebo/Clock.hh
include/GazeboYarpPlugins/ClockServerImpl.h
Expand Down
2 changes: 1 addition & 1 deletion plugins/contactloadcellarray/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ endif()
add_gazebo_yarp_plugin_target(LIBRARY_NAME contactloadcellarray
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDE_DIRS include/gazebo include/yarp/dev
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${YARP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
LINKED_LIBRARIES ${LIB_COMMON_NAME} gazebo_yarp_singleton ${YARP_LIBRARIES} ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES} ${SDFORMAT_LIBRARIES}
HEADERS include/gazebo/ContactLoadCellArray.hh
include/yarp/dev/ContactLoadCellArrayDriver.h
Expand Down
2 changes: 1 addition & 1 deletion plugins/controlboard/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ endif()

add_gazebo_yarp_plugin_target(LIBRARY_NAME controlboard
INCLUDE_DIRS include/gazebo include/yarp/dev
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${YARP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
LINKED_LIBRARIES ${LIB_COMMON_NAME} gazebo_yarp_singleton ${YARP_LIBRARIES} ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES}
HEADERS ${controlBoard_headers}
SOURCES ${controlBoard_source})
6 changes: 3 additions & 3 deletions plugins/controlboard/include/yarp/dev/ControlBoardDriver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class yarp::dev::GazeboYarpControlBoardDriver:
*/

// AXIS IAxisInfo
virtual bool getAxisName(int axis, yarp::os::ConstString& name);
virtual bool getAxisName(int axis, std::string& name);
virtual bool getJointType(int axis, yarp::dev::JointTypeEnum& type);

//DEVICE DRIVER
Expand Down Expand Up @@ -311,8 +311,8 @@ class yarp::dev::GazeboYarpControlBoardDriver:
*/

// RemoteVariables Interface
virtual bool getRemoteVariable(yarp::os::ConstString key, yarp::os::Bottle& val);
virtual bool setRemoteVariable(yarp::os::ConstString key, const yarp::os::Bottle& val);
virtual bool getRemoteVariable(std::string key, yarp::os::Bottle& val);
virtual bool setRemoteVariable(std::string key, const yarp::os::Bottle& val);
virtual bool getRemoteVariablesList(yarp::os::Bottle* listOfKeys);

// CONTROL LIMITS2 (inside comanOthers.cpp)
Expand Down
4 changes: 2 additions & 2 deletions plugins/controlboard/src/ControlBoard.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ GZ_REGISTER_MODEL_PLUGIN(GazeboYarpControlBoard)

if(m_parameters.check("ROS"))
{
yarp::os::ConstString ROS;
ROS = yarp::os::ConstString ("(") + m_parameters.findGroup("ROS").toString() + yarp::os::ConstString (")");
std::string ROS;
ROS = std::string ("(") + m_parameters.findGroup("ROS").toString() + std::string (")");
wrapper_group.append(yarp::os::Bottle(ROS));
}

Expand Down
6 changes: 3 additions & 3 deletions plugins/controlboard/src/ControlBoardDriverOthers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

using namespace yarp::dev;

bool GazeboYarpControlBoardDriver::getAxisName(int axis, yarp::os::ConstString& name)
bool GazeboYarpControlBoardDriver::getAxisName(int axis, std::string& name)
{
if (axis < 0 || static_cast<size_t>(axis) >= m_numberOfJoints) return false;

Expand All @@ -23,7 +23,7 @@ bool GazeboYarpControlBoardDriver::getAxisName(int axis, yarp::os::ConstString&
}
}
}
name = yarp::os::ConstString(controlboard_joint_names.at(axis));
name = std::string(controlboard_joint_names.at(axis));
return true;
}

Expand All @@ -38,7 +38,7 @@ bool GazeboYarpControlBoardDriver::getJointType(int axis, yarp::dev::JointTypeEn
type = yarp::dev::VOCAB_JOINTTYPE_UNKNOWN;
}

yarp::os::ConstString(controlboard_joint_names.at(axis));
std::string(controlboard_joint_names.at(axis));
return true;
}

Expand Down
4 changes: 2 additions & 2 deletions plugins/controlboard/src/ControlBoardDriverRemoteVariables.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ bool GazeboYarpControlBoardDriver::getRemoteVariablesList(yarp::os::Bottle* list
return true;
}

bool GazeboYarpControlBoardDriver::getRemoteVariable(yarp::os::ConstString key, yarp::os::Bottle& val)
bool GazeboYarpControlBoardDriver::getRemoteVariable(std::string key, yarp::os::Bottle& val)
{
val.clear();
if (key == "hardwareDamping")
Expand Down Expand Up @@ -130,7 +130,7 @@ bool GazeboYarpControlBoardDriver::getRemoteVariable(yarp::os::ConstString key,
return false;
}

bool GazeboYarpControlBoardDriver::setRemoteVariable(yarp::os::ConstString key, const yarp::os::Bottle& val)
bool GazeboYarpControlBoardDriver::setRemoteVariable(std::string key, const yarp::os::Bottle& val)
{
std::string s1 = val.toString();
yarp::os::Bottle* bval = val.get(0).asList();
Expand Down
2 changes: 1 addition & 1 deletion plugins/depthCamera/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ endif()

add_gazebo_yarp_plugin_target(LIBRARY_NAME depthCamera
INCLUDE_DIRS include/gazebo include/yarp/dev
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${YARP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS} ${OGRE_INCLUDE_DIRS}
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS} ${OGRE_INCLUDE_DIRS}
LINKED_LIBRARIES ${LIB_COMMON_NAME} gazebo_yarp_singleton ${YARP_LIBRARIES} ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES} DepthCameraPlugin
HEADERS include/gazebo/DepthCamera.hh
include/yarp/dev/DepthCameraDriver.h
Expand Down
2 changes: 1 addition & 1 deletion plugins/depthCamera/include/yarp/dev/DepthCameraDriver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class yarp::dev::GazeboYarpDepthCameraDriver: public yarp::dev::DeviceDriver,
virtual bool getExtrinsicParam(sig::Matrix &extrinsic);
virtual bool getImages(FlexImage& colorFrame, depthImageType& depthFrame, Stamp* colorStamp=NULL, Stamp* depthStamp=NULL);
virtual RGBDSensor_status getSensorStatus();
virtual yarp::os::ConstString getLastErrorMsg(Stamp* timeStamp = NULL);
virtual std::string getLastErrorMsg(Stamp* timeStamp = NULL);
/*
* INTERFACE TOWARD GAZEBO SIMULATOR CORE
* Get the image from the simulator and store it internally
Expand Down
2 changes: 1 addition & 1 deletion plugins/depthCamera/src/DepthCameraDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ IRGBDSensor::RGBDSensor_status GazeboYarpDepthCameraDriver::getSensorStatus()
{
return m_depthCameraSensorPtr->IsActive() ? RGBD_SENSOR_OK_IN_USE : RGBD_SENSOR_NOT_READY;
}
yarp::os::ConstString GazeboYarpDepthCameraDriver::getLastErrorMsg(Stamp* timeStamp)
std::string GazeboYarpDepthCameraDriver::getLastErrorMsg(Stamp* timeStamp)
{
if(timeStamp)
{
Expand Down
2 changes: 1 addition & 1 deletion plugins/externalwrench/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include(AddGazeboYarpPluginTarget)

add_gazebo_yarp_plugin_target(LIBRARY_NAME externalwrench
INCLUDE_DIRS include/gazebo
SYSTEM_INCLUDE_DIRS ${YARP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
SYSTEM_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
LINKED_LIBRARIES ${YARP_LIBRARIES} ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES}
HEADERS include/gazebo/ApplyExternalWrench.hh
SOURCES src/ApplyExternalWrench.cc
Expand Down
8 changes: 7 additions & 1 deletion plugins/externalwrench/src/ApplyExternalWrench.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,13 @@ void ApplyExternalWrench::UpdateChild()
#else
msgs::Set ( m_visualMsg.mutable_pose(), linkCoGPose );
#endif
msgs::Set ( m_visualMsg.mutable_material()->mutable_ambient(),common::Color ( 1,0,0,0.3 ) );
double red = 1;
double alpha = 0.3;
#if GAZEBO_MAJOR_VERSION >= 9
msgs::Set(m_visualMsg.mutable_material()->mutable_ambient(), ignition::math::Color(red,0,0,alpha));
#else
msgs::Set(m_visualMsg.mutable_material()->mutable_ambient(), common::Color(red,0,0,alpha));
#endif
m_visualMsg.set_visible ( 1 );
m_visPub->Publish ( m_visualMsg );
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/fakecontrolboard/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ endif()

add_gazebo_yarp_plugin_target(LIBRARY_NAME fakecontrolboard
INCLUDE_DIRS include/gazebo include/yarp/dev
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${YARP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
LINKED_LIBRARIES ${LIB_COMMON_NAME} gazebo_yarp_singleton ${YARP_LIBRARIES} ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES}
HEADERS ${plugin_headers}
SOURCES ${plugin_source}
Expand Down
6 changes: 3 additions & 3 deletions plugins/fakecontrolboard/include/yarp/dev/FakeControlBoardDriver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class yarp::dev::GazeboYarpFakeControlBoardDriver:
*/

// AXIS IAxisInfo
virtual bool getAxisName(int axis, yarp::os::ConstString& name);
virtual bool getAxisName(int axis, std::string& name);
virtual bool getJointType(int axis, yarp::dev::JointTypeEnum& type);

//DEVICE DRIVER
Expand Down Expand Up @@ -290,8 +290,8 @@ class yarp::dev::GazeboYarpFakeControlBoardDriver:
*/

// RemoteVariables Interface
virtual bool getRemoteVariable(yarp::os::ConstString key, yarp::os::Bottle& val);
virtual bool setRemoteVariable(yarp::os::ConstString key, const yarp::os::Bottle& val);
virtual bool getRemoteVariable(std::string key, yarp::os::Bottle& val);
virtual bool setRemoteVariable(std::string key, const yarp::os::Bottle& val);
virtual bool getRemoteVariablesList(yarp::os::Bottle* listOfKeys);

// CONTROL LIMITS2 (inside comanOthers.cpp)
Expand Down
4 changes: 2 additions & 2 deletions plugins/fakecontrolboard/src/FakeControlBoard.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ GZ_REGISTER_MODEL_PLUGIN(GazeboYarpFakeControlBoard)

if(m_pluginParameters.check("ROS"))
{
yarp::os::ConstString ROS;
ROS = yarp::os::ConstString ("(") + m_pluginParameters.findGroup("ROS").toString() + yarp::os::ConstString (")");
std::string ROS;
ROS = std::string ("(") + m_pluginParameters.findGroup("ROS").toString() + std::string (")");
wrapper_group.append(yarp::os::Bottle(ROS));
}

Expand Down
4 changes: 2 additions & 2 deletions plugins/fakecontrolboard/src/FakeControlBoardDriverOthers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

using namespace yarp::dev;

bool GazeboYarpFakeControlBoardDriver::getAxisName(int axis, yarp::os::ConstString& name)
bool GazeboYarpFakeControlBoardDriver::getAxisName(int axis, std::string& name)
{
if (axis < 0 || axis >= (int)m_numberOfJoints) return false;
name = yarp::os::ConstString(m_jointNames.at(axis));
name = std::string(m_jointNames.at(axis));
return true;
}

Expand Down
4 changes: 2 additions & 2 deletions plugins/fakecontrolboard/src/FakeControlBoardDriverRemoteVariables.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ bool GazeboYarpFakeControlBoardDriver::getRemoteVariablesList(yarp::os::Bottle*
return true;
}

bool GazeboYarpFakeControlBoardDriver::getRemoteVariable(yarp::os::ConstString key, yarp::os::Bottle& val)
bool GazeboYarpFakeControlBoardDriver::getRemoteVariable(std::string key, yarp::os::Bottle& val)
{
val.clear();
yWarning("getRemoteVariable(): Unknown variable %s", key.c_str());
return false;
}

bool GazeboYarpFakeControlBoardDriver::setRemoteVariable(yarp::os::ConstString key, const yarp::os::Bottle& val)
bool GazeboYarpFakeControlBoardDriver::setRemoteVariable(std::string key, const yarp::os::Bottle& val)
{
yWarning("setRemoteVariable(): Unknown variable %s", key.c_str());
return false;
Expand Down
2 changes: 1 addition & 1 deletion plugins/forcetorque/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ endif()

add_gazebo_yarp_plugin_target(LIBRARY_NAME forcetorque
INCLUDE_DIRS include/gazebo include/yarp/dev
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${YARP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
LINKED_LIBRARIES ${LIB_COMMON_NAME} gazebo_yarp_singleton ${YARP_LIBRARIES} ${GAZEBO_LIBRARIES} ForceTorquePlugin ${Boost_LIBRARIES}
HEADERS include/gazebo/ForceTorque.hh
include/yarp/dev/ForceTorqueDriver.h
Expand Down
2 changes: 1 addition & 1 deletion plugins/imu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ endif()

add_gazebo_yarp_plugin_target(LIBRARY_NAME imu
INCLUDE_DIRS include/gazebo include/yarp/dev
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${YARP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
LINKED_LIBRARIES ${LIB_COMMON_NAME} gazebo_yarp_singleton ${YARP_LIBRARIES} ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES}
HEADERS include/gazebo/IMU.hh
include/yarp/dev/IMUDriver.h
Expand Down
2 changes: 1 addition & 1 deletion plugins/inertialmtb/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ endif()
add_gazebo_yarp_plugin_target(LIBRARY_NAME inertial
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDE_DIRS include/gazebo include/yarp/dev
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${YARP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
LINKED_LIBRARIES ${LIB_COMMON_NAME} gazebo_yarp_singleton ${YARP_LIBRARIES} ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES}
HEADERS include/gazebo/inertialMTB.hh
SOURCES src/inertialMTB.cc
Expand Down
2 changes: 1 addition & 1 deletion plugins/inertialmtbPart/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ endif()
add_gazebo_yarp_plugin_target(LIBRARY_NAME distributedinertials
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDE_DIRS include/gazebo include/yarp/dev
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${YARP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
LINKED_LIBRARIES ${LIB_COMMON_NAME} gazebo_yarp_singleton ${YARP_LIBRARIES} ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES}
HEADERS include/gazebo/inertialMTBPart.hh
include/yarp/dev/inertialMTBPartDriver.h
Expand Down
2 changes: 1 addition & 1 deletion plugins/jointsensors/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ endif()

add_gazebo_yarp_plugin_target(LIBRARY_NAME jointsensors
INCLUDE_DIRS include/gazebo include/yarp/dev
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${YARP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
LINKED_LIBRARIES ${LIB_COMMON_NAME} gazebo_yarp_singleton ${YARP_LIBRARIES} ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES}
HEADERS include/gazebo/JointSensors.hh
include/yarp/dev/JointSensorsDriver.h
Expand Down
2 changes: 1 addition & 1 deletion plugins/lasersensor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ endif()

add_gazebo_yarp_plugin_target(LIBRARY_NAME lasersensor
INCLUDE_DIRS include/gazebo include/yarp/dev
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${YARP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
SYSTEM_INCLUDE_DIRS ${GAZEBO_YARP_COMMON_HEADERS} ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
LINKED_LIBRARIES ${LIB_COMMON_NAME} gazebo_yarp_singleton ${YARP_LIBRARIES} ${GAZEBO_LIBRARIES} RayPlugin ${Boost_LIBRARIES}
HEADERS include/gazebo/LaserSensor.hh
include/yarp/dev/LaserSensorDriver.h
Expand Down
Loading