Skip to content

Commit

Permalink
Merge pull request ros-industrial#20 from gavanderhoorn/issue19_simpl…
Browse files Browse the repository at this point in the history
…e_message_build_order2

Fix issue ros-industrial#19: simple_message build order for Groovy.
  • Loading branch information
shaun-edwards committed Jul 24, 2013
2 parents bd525cb + dbb919d commit 8c0b267
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions simple_message/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ include_directories(include
# DEFAULT LIBRARY (SAME ENDIAN)
add_library(simple_message ${SRC_FILES})
target_link_libraries(simple_message ${catkin_LIBRARIES})
add_dependencies(simple_message simple_message_gencpp)
add_dependencies(simple_message ${industrial_msgs_EXPORTED_TARGETS})

catkin_add_gtest(utest ${UTEST_SRC_FILES})
target_link_libraries(utest simple_message)
Expand All @@ -98,7 +98,7 @@ target_link_libraries(utest simple_message)
add_library(simple_message_bswap ${SRC_FILES})
set_target_properties(simple_message_bswap PROPERTIES COMPILE_DEFINITIONS "BYTE_SWAPPING")
target_link_libraries(simple_message_bswap ${catkin_LIBRARIES})
add_dependencies(simple_message_bswap simple_message_gencpp)
add_dependencies(simple_message_bswap ${industrial_msgs_EXPORTED_TARGETS})

catkin_add_gtest(utest_byte_swapping ${UTEST_SRC_FILES})
target_link_libraries(utest_byte_swapping simple_message_bswap)
Expand All @@ -107,7 +107,7 @@ target_link_libraries(utest_byte_swapping simple_message_bswap)
add_library(simple_message_float64 ${SRC_FILES})
set_target_properties(simple_message_float64 PROPERTIES COMPILE_DEFINITIONS "FLOAT64")
target_link_libraries(simple_message_float64 ${catkin_LIBRARIES})
add_dependencies(simple_message_float64 simple_message_gencpp)
add_dependencies(simple_message_float64 ${industrial_msgs_EXPORTED_TARGETS})

catkin_add_gtest(utest_float64 ${UTEST_SRC_FILES})
set_target_properties(utest_float64 PROPERTIES COMPILE_DEFINITIONS "FLOAT64")
Expand Down

0 comments on commit 8c0b267

Please sign in to comment.