Skip to content

Commit b27c3b7

Browse files
Lukas Bulwahnbulwahn
authored andcommitted
check for CATKIN_ENABLE_TESTING
1 parent f41ba21 commit b27c3b7

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

CMakeLists.txt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,21 @@ add_dependencies(point_cloud2_assembler ${PROJECT_NAME}_gencpp)
6767

6868
## unit testing
6969

70-
add_executable(periodic_snapshotter examples/periodic_snapshotter.cpp)
71-
target_link_libraries(periodic_snapshotter ${catkin_LIBRARIES} ${Boost_LIBRARIES})
72-
add_dependencies(periodic_snapshotter ${PROJECT_NAME}_gencpp)
70+
if(CATKIN_ENABLE_TESTING)
71+
add_executable(periodic_snapshotter examples/periodic_snapshotter.cpp)
72+
target_link_libraries(periodic_snapshotter ${catkin_LIBRARIES} ${Boost_LIBRARIES})
73+
add_dependencies(periodic_snapshotter ${PROJECT_NAME}_gencpp)
7374

74-
add_executable(dummy_scan_producer test/dummy_scan_producer.cpp)
75-
target_link_libraries(dummy_scan_producer ${catkin_LIBRARIES} ${Boost_LIBRARIES})
76-
add_dependencies(dummy_scan_producer ${PROJECT_NAME}_gencpp)
75+
add_executable(dummy_scan_producer test/dummy_scan_producer.cpp)
76+
target_link_libraries(dummy_scan_producer ${catkin_LIBRARIES} ${Boost_LIBRARIES})
77+
add_dependencies(dummy_scan_producer ${PROJECT_NAME}_gencpp)
7778

78-
catkin_add_gtest(test_assembler EXCLUDE_FROM_ALL test/test_assembler.cpp)
79-
target_link_libraries(test_assembler ${catkin_LIBRARIES} ${Boost_LIBRARIES})
80-
add_dependencies(test_assembler ${PROJECT_NAME}_gencpp)
79+
catkin_add_gtest(test_assembler EXCLUDE_FROM_ALL test/test_assembler.cpp)
80+
target_link_libraries(test_assembler ${catkin_LIBRARIES} ${Boost_LIBRARIES})
81+
add_dependencies(test_assembler ${PROJECT_NAME}_gencpp)
8182

82-
add_rostest(test/test_laser_assembler.launch)
83+
add_rostest(test/test_laser_assembler.launch)
84+
endif()
8385

8486
##############################################################################
8587
# Install

package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<license>BSD</license>
1414
<url>http://ros.org/wiki/laser_assembler</url>
1515

16-
<buildtool_depend>catkin</buildtool_depend>
16+
<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
1717

1818
<build_depend>message_generation</build_depend>
1919
<build_depend>sensor_msgs</build_depend>

0 commit comments

Comments
 (0)