Skip to content

Commit

Permalink
Removed ROS specific code
Browse files Browse the repository at this point in the history
  • Loading branch information
wjwwood committed Jan 17, 2013
1 parent c7eb198 commit 974ea8a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 61 deletions.
36 changes: 8 additions & 28 deletions cmake/segwayrmp_serial.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,16 @@ if(SEGWAYRMP_USE_SERIAL)
set(SEGWAYRMP_USE_SERIAL TRUE)
include_directories(serial_INCLUDE_DIRS)
list(APPEND SEGWAYRMP_LINK_LIBS ${serial_LIBRARIES})
else(serial_FOUND)
# Try to use ROS to find it
set(ROS_ROOT $ENV{ROS_ROOT})
if(DEFINED ROS_ROOT)
message("-- Using ROS to resolve serial dependency")
# Setup ROS build
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rosbuild_init()
# Add include and link directories
include_directories(${${PROJECT_NAME}_INCLUDE_DIRS})
link_directories(${${PROJECT_NAME}_LIBRARY_DIRS})
# Add ROS libraries for this "project"
list(APPEND SEGWAYRMP_LINK_LIBS ${${PROJECT_NAME}_LIBRARIES})
# Set the default path for built executables to the "bin" directory
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
# set the default path for built libraries to the "lib" directory
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
# We found it, set true
set(SEGWAYRMP_USE_SERIAL TRUE)
else(DEFINED ROS_ROOT)
# Could not find serial either through find_package or ROS
message("--")
message("-- Serial support disabled: Serial library not found.")
message("--")
endif(DEFINED ROS_ROOT)
endif(serial_FOUND)
else()
# Could not find serial either through find_package or ROS
message("--")
message("-- Serial support disabled: Serial library not found.")
message("--")
endif()

if(SEGWAYRMP_USE_SERIAL)
message("-- Building SegwayRMP with serial support")
list(APPEND SEGWAYRMP_SRCS src/impl/rmp_serial.cc)
add_definitions(-DSEGWAYRMP_USE_SERIAL)
endif(SEGWAYRMP_USE_SERIAL)
endif(SEGWAYRMP_USE_SERIAL)
endif()
endif()
19 changes: 0 additions & 19 deletions manifest.xml

This file was deleted.

7 changes: 2 additions & 5 deletions segway.sublime-project
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@
"folders":
[
{
"path": "/Users/william/devel/tmp/segwayrmp"
"path": "."
},
{
"path": "/Users/william/devel/segwayrmp_ws/libsegwayrmp"
},
{
"path": "/Users/william/devel/serial"
"path": "../serial"
}
],
"settings":
Expand Down
9 changes: 0 additions & 9 deletions stack.xml

This file was deleted.

0 comments on commit 974ea8a

Please sign in to comment.