Skip to content

Commit bb89133

Browse files
Boost depend testing (#44)
* remove installation of boost from circleci config * modify CMakeLists so that the messages and library end up where they belong in humble * reset circleci config to the way it was before
1 parent 41c0d60 commit bb89133

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

CMakeLists.txt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,32 @@ endif()
1212

1313
find_package(ament_cmake REQUIRED)
1414
find_package(ament_cmake_auto REQUIRED)
15+
find_package(rosidl_default_generators REQUIRED)
1516
ament_auto_find_build_dependencies()
1617

1718

1819
## Generate messages in the 'msg' folder
19-
rosidl_generate_interfaces(${PROJECT_NAME}_msgs
20+
rosidl_generate_interfaces(${PROJECT_NAME}
2021
"msg/TCPFrame.msg"
2122
"msg/UDPFrame.msg"
2223
DEPENDENCIES builtin_interfaces std_msgs
2324
)
2425

25-
26-
###########
27-
## Build ##
28-
###########
26+
ament_export_dependencies(rosidl_default_runtime)
2927

3028
include_directories(
3129
include
3230
)
3331

3432
add_library(
35-
${PROJECT_NAME}
33+
${PROJECT_NAME}_lib
3634
src/tcp_interface.cpp
3735
src/udp_interface.cpp
3836
src/udp_server.cpp
3937
src/utils.cpp
4038
)
4139

42-
ament_export_targets(${PROJECT_NAME} HAS_LIBRARY_TARGET)
40+
ament_export_targets(${PROJECT_NAME}_lib HAS_LIBRARY_TARGET)
4341

4442
#############
4543
## Install ##
@@ -51,12 +49,12 @@ install(
5149
)
5250

5351
install(
54-
TARGETS ${PROJECT_NAME}
55-
EXPORT ${PROJECT_NAME}
52+
TARGETS ${PROJECT_NAME}_lib
53+
EXPORT ${PROJECT_NAME}_lib
5654
ARCHIVE DESTINATION lib
5755
LIBRARY DESTINATION lib
5856
RUNTIME DESTINATION bin
5957
INCLUDES DESTINATION include
6058
)
6159

62-
ament_package()
60+
ament_package()

0 commit comments

Comments
 (0)