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

adaptations to new rock-ros #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

adaptations to new rock-ros #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@ link_directories(${OROCOS-RTT_LIBRARY_DIRS})
add_definitions(${OROCOS-RTT_DEFINITIONS})

if(NOT DEFINED ROS_FOUND)
find_package( ROS QUIET REQUIRED COMPONENTS roslib )
# find_package( ROS QUIET REQUIRED COMPONENTS roslib )
find_package( roscpp )
endif(NOT DEFINED ROS_FOUND)

include_directories(${ROS_INCLUDE_DIRS})
link_directories(${ROS_LIBRARY_DIRS})
include_directories(${roscpp_INCLUDE_DIRS})
link_directories(${roscpp_LIBRARY_DIRS})

add_library(rtt-transport-ros-${OROCOS_TARGET} SHARED
ros_publish_activity.cpp)
Expand Down
2 changes: 1 addition & 1 deletion manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<author>Ruben Smits, [email protected]</author>
<license>BSD</license>
<url>http://ros.org/wiki/rtt_rosnode</url>
<depend package="roslib"/>

<depend package="rtt"/>
</package>

Expand Down