[style] fixup cmake and package.xml

This commit is contained in:
William Woodall 2014-02-23 11:05:08 -08:00
parent cc27bb12ba
commit 390a2d4767
2 changed files with 23 additions and 14 deletions

View File

@ -1,10 +1,16 @@
cmake_minimum_required(VERSION 2.8.3) cmake_minimum_required(VERSION 2.8.3)
project(laser_geometry) project(laser_geometry)
find_package(catkin REQUIRED cmake_modules sensor_msgs roscpp tf angles)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) find_package(catkin REQUIRED
COMPONENTS
angles
cmake_modules
roscpp
sensor_msgs
tf
)
find_package(Boost REQUIRED COMPONENTS thread) find_package(Boost REQUIRED COMPONENTS system thread)
find_package(Eigen REQUIRED) find_package(Eigen REQUIRED)
@ -14,8 +20,11 @@ catkin_package(
DEPENDS Boost Eigen DEPENDS Boost Eigen
) )
include_directories(SYSTEM ${Boost_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}) include_directories(include
include_directories(include ${catkin_INCLUDE_DIRS}) ${catkin_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${Eigen_INCLUDE_DIRS}
)
add_library(laser_geometry src/laser_geometry.cpp) add_library(laser_geometry src/laser_geometry.cpp)
target_link_libraries(laser_geometry ${Boost_LIBRARIES} ${tf_LIBRARIES}) target_link_libraries(laser_geometry ${Boost_LIBRARIES} ${tf_LIBRARIES})

View File

@ -18,19 +18,19 @@
<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend> <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<build_depend>cmake_modules</build_depend>
<build_depend>sensor_msgs</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>tf</build_depend>
<build_depend>angles</build_depend> <build_depend>angles</build_depend>
<build_depend>eigen</build_depend>
<build_depend>boost</build_depend> <build_depend>boost</build_depend>
<build_depend>cmake_modules</build_depend>
<build_depend>eigen</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>sensor_msgs</build_depend>
<build_depend>tf</build_depend>
<run_depend>sensor_msgs</run_depend>
<run_depend>roscpp</run_depend>
<run_depend>tf</run_depend>
<run_depend>angles</run_depend> <run_depend>angles</run_depend>
<run_depend>eigen</run_depend>
<run_depend>boost</run_depend> <run_depend>boost</run_depend>
<run_depend>eigen</run_depend>
<run_depend>roscpp</run_depend>
<run_depend>sensor_msgs</run_depend>
<run_depend>tf</run_depend>
</package> </package>