Skip to content

Commit 62a86c3

Browse files
committed
Convert to catkin_simple and compile
1 parent bdd857d commit 62a86c3

File tree

2 files changed

+14
-38
lines changed

2 files changed

+14
-38
lines changed

CMakeLists.txt

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,20 @@
11
cmake_minimum_required(VERSION 2.8.3)
22
project(geodetic_utils)
33

4-
set(CMAKE_BUILD_TYPE Release)
5-
6-
set(CXXFLAGS ${CXXFLAGS} -fPIC)
7-
# Linux specific flags
8-
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
9-
set(CXXFLAGS ${CXXFLAGS} -fPIC)
10-
add_definitions(-std=c++0x)
11-
endif()
12-
13-
find_package(catkin REQUIRED COMPONENTS
14-
roslib
15-
tf
16-
geometry_msgs
17-
roscpp
18-
sensor_msgs
19-
cmake_modules
20-
)
21-
22-
find_package(Eigen REQUIRED)
23-
244
add_definitions(-std=c++11)
255

26-
catkin_package(
27-
INCLUDE_DIRS include ${Eigen_INCLUDE_DIRS}
28-
CATKIN_DEPENDS geometry_msgs roscpp sensor_msgs geometry_msgs
29-
DEPENDS Eigen
30-
)
31-
32-
include_directories(
33-
include
34-
${catkin_INCLUDE_DIRS}
35-
${Eigen_INCLUDE_DIRS}
36-
)
6+
find_package(catkin_simple REQUIRED)
7+
catkin_simple(ALL_DEPS_REQUIRED)
378

9+
find_package(Eigen REQUIRED)
10+
include_directories(${Eigen_INCLUDE_DIRS})
3811

39-
add_executable(set_gps_reference_node src/set_gps_reference_node.cpp)
40-
add_dependencies(set_gps_reference_node ${catkin_EXPORTED_TARGETS})
12+
cs_add_executable(set_gps_reference_node src/set_gps_reference_node.cpp)
4113
target_link_libraries(set_gps_reference_node ${catkin_LIBRARIES})
4214

43-
add_executable(gps_to_pose_conversion_node src/gps_to_pose_conversion_node.cpp)
44-
add_dependencies(gps_to_pose_conversion_node ${catkin_EXPORTED_TARGETS})
15+
cs_add_executable(gps_to_pose_conversion_node src/gps_to_pose_conversion_node.cpp)
4516
target_link_libraries(gps_to_pose_conversion_node ${catkin_LIBRARIES})
4617

47-
18+
cs_install()
19+
cs_install_scripts(src/gps_spoofer.py src/euler_radians_to_degrees.py src/odometry_height_adjuster.py)
20+
cs_export()

package.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,20 @@
66

77
<author>Enric Galceran</author>
88
<author>Marija Popovic</author>
9+
<author>Raghav Khanna</author>
910

1011
<maintainer email="[email protected]">Enric Galceran</maintainer>
1112
<license>BSD</license>
1213

1314
<buildtool_depend>catkin</buildtool_depend>
1415
<buildtool_depend>catkin_simple</buildtool_depend>
1516

17+
<!-- Dependencies. -->
1618
<depend>roslib</depend>
1719
<depend>roscpp</depend>
1820
<depend>tf</depend>
1921
<depend>sensor_msgs</depend>
20-
<depend>geometry_msgs</depend>
22+
<depend>geometry_msgs</depend>
23+
<!--cmake_modules dependency required for (find Eigen) command-->
24+
<depend>cmake_modules</depend>
2125
</package>
22-

0 commit comments

Comments
 (0)