Skip to content

Commit

Permalink
Don't double-build convert.cpp (#184)
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Carroll <michael@openrobotics.org>
  • Loading branch information
mjcarroll committed Oct 27, 2021
1 parent a258c48 commit 7e49c03
Showing 1 changed file with 14 additions and 17 deletions.
31 changes: 14 additions & 17 deletions ros_ign_bridge/CMakeLists.txt
Expand Up @@ -67,6 +67,19 @@ set(common_sources
src/factories.cpp
)

set(bridge_lib
ros_ign_bridge_lib
)

add_library(${bridge_lib}
${common_sources}
)
target_link_libraries(${bridge_lib}
${catkin_LIBRARIES}
ignition-msgs${IGN_MSGS_VER}::core
ignition-transport${IGN_TRANSPORT_VER}::core
)

set(bridge_executables
parameter_bridge
static_bridge
Expand All @@ -75,31 +88,15 @@ set(bridge_executables
foreach(bridge ${bridge_executables})
add_executable(${bridge}
src/${bridge}.cpp
${common_sources}
)
target_link_libraries(${bridge}
${catkin_LIBRARIES}
ignition-msgs${IGN_MSGS_VER}::core
ignition-transport${IGN_TRANSPORT_VER}::core
${bridge_lib}
)
install(TARGETS ${bridge}
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)
endforeach(bridge)

set(bridge_lib
ros_ign_bridge_lib
)

add_library(${bridge_lib}
${common_sources}
)
target_link_libraries(${bridge_lib}
${catkin_LIBRARIES}
ignition-msgs${IGN_MSGS_VER}::core
ignition-transport${IGN_TRANSPORT_VER}::core
)

catkin_package(INCLUDE_DIRS include
LIBRARIES ${bridge_lib})

Expand Down

0 comments on commit 7e49c03

Please sign in to comment.