Skip to content

Commit

Permalink
roslint compliance, also will not need geometry_msgs once ros-percept…
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasw committed Mar 15, 2016
1 parent 4097380 commit fe9d8e9
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 4 deletions.
8 changes: 7 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ project(xdo_ros)
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages
find_package(catkin REQUIRED COMPONENTS
# TODO(lucasw) remove this once opencv_apps is updated
geometry_msgs
message_generation
opencv_apps
roscpp
roslint
std_msgs
)

roslint_cpp()

## System dependencies are found with CMake's conventions
# find_package(xdo REQUIRED)
find_library(xdo_LIBRARY NAMES xdo libxdo PATHS /usr/lib)
Expand Down Expand Up @@ -74,7 +78,9 @@ add_message_files(
## Generate added messages and services with any dependencies listed here
generate_messages(
DEPENDENCIES
geometry_msgs # It seems like opencv_apps needs to CATKIN_DEPENDS this TODO(lucasw)
# TODO(lucasw) remove this once opencv_apps is updated
# https://github.com/ros-perception/vision_opencv/pull/119
geometry_msgs
opencv_apps # Or other packages containing msgs
std_msgs
)
Expand Down
3 changes: 2 additions & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@
<!-- <test_depend>gtest</test_depend> -->
<buildtool_depend>catkin</buildtool_depend>
<build_depend>libxdo-dev</build_depend>
<!-- TODO(lucaw) this should be gotten through opencv_apps -->
<!-- TODO(lucaw) remove this once opencv_apps is updates -->
<build_depend>geometry_msgs</build_depend>
<build_depend>message_generation</build_depend>
<build_depend>opencv_apps</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>roslint</build_depend>
<build_depend>std_msgs</build_depend>
<run_depend>message_runtime</run_depend>
<run_depend>roscpp</run_depend>
Expand Down
8 changes: 8 additions & 0 deletions src/test.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Copyright 2016 Lucas Walter
#include <xdo.h>

int main(int argc, char** argv)
{
xdo_t* xdo = xdo_new(NULL);
xdo_move_mouse(xdo, 50, 50, 0);
}
4 changes: 2 additions & 2 deletions src/xdo_ros.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ Copyright 2016 Lucas Walter
#include <std_msgs/String.h>
#include <xdo_ros/Mouse.h>

extern "C" {
extern "C"
{
#include <xdo.h>
}

Expand Down Expand Up @@ -50,7 +51,6 @@ XdoRos::XdoRos()

void XdoRos::update(const ros::TimerEvent& e)
{

}

void XdoRos::mousePosCallback(const opencv_apps::Point2D::ConstPtr& msg)
Expand Down

0 comments on commit fe9d8e9

Please sign in to comment.