Skip to content

Commit

Permalink
Moved roswrap-headers of ros-generated messages
Browse files Browse the repository at this point in the history
Moved roswrap-headers of ros-generated messages to avoid include path dependencies
  • Loading branch information
rostest committed Oct 25, 2021
1 parent fda4662 commit 10262b6
Show file tree
Hide file tree
Showing 11 changed files with 7 additions and 1,302 deletions.
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
cmake_minimum_required(VERSION 3.5)

# build options: set OFF for relese version, ON for development and test
option(ENABLE_EMULATOR "Build emulator for offline and unittests" ON) # OFF (release) or ON (development)
option(ENABLE_EMULATOR "Build emulator for offline and unittests" OFF) # OFF (release) or ON (development)
if(WIN32)
option(BUILD_WITH_LDMRS_SUPPORT "Build sick_scan_xd with LDMRS support (requires libsick_ldmrs from https://github.com/SICKAG/libsick_ldmrs" OFF)
elseif(LDMRS EQUAL 0)
Expand Down Expand Up @@ -362,6 +362,9 @@ if(ROS_VERSION EQUAL 1)
endif(ROS_VERSION EQUAL 1)

include_directories(include include/tinyxml ${catkin_INCLUDE_DIRS} ${LDMRS_INCLUDES} include/sick_scan tools/test_server/include roswrap/src/include roswrap/src/include/launchparser) # ${Boost_INCLUDE_DIR}
if(ROS_VERSION EQUAL 0)
include_directories(roswrap/src/msg_header)
endif()

if(ROS_VERSION EQUAL 1)
set(SICK_SCAN_LIB_SRC
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Based on the sick_scan drivers for ROS1, sick_scan_xd merges sick_scan, sick_sca
- [Executive Summary](#executive-summary)
- [Supported Hardware](#supported-hardware)
- [Supported Hardware](#supported-hardware)
- [Build on Linux](#build-on-linux)
- [Build on Linux generic without ROS](#build-on-linux-generic-without-ros)
- [Build on Linux ROS1](#build-on-linux-ros1)
- [Build on Linux ROS2](#build-on-linux-ros2)
- [Build on Windows](#build-on-windows)
Expand Down Expand Up @@ -121,13 +121,14 @@ sick_scan_xd can be build on Linux and Windows, with and without ROS, with and w
| Windows, ROS-2, no LDMRS | BUILD_WITH_LDMRS_SUPPORT OFF | cd test\\scripts && make_ros2.cmd |

If you're using ROS, set your ROS-environment before running one of these scripts, f.e.
* `source /opt/ros/noetic/setup.bash` for ROS-1 noetic, or
* `source /opt/ros/melodic/setup.bash` for ROS-1 melodic, or
* `source /opt/ros/eloquent/setup.bash` for ROS-2 eloquent, or
* `source /opt/ros/foxy/setup.bash` for ROS-2 fox.

See the build descriptions below for more details.

## Build on Linux
## Build on Linux generic without ROS

Run the following steps to build sick_scan_xd on Linux (no ROS required):

Expand Down
Loading

0 comments on commit 10262b6

Please sign in to comment.