Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions rcl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,11 @@ target_include_directories(${PROJECT_NAME} PUBLIC
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
target_link_libraries(${PROJECT_NAME} PUBLIC
# TODO(clalancette): rcl_interfaces should be PRIVATE, but downstream depends on it for now
<<<<<<< HEAD
$<$<NOT:$<BOOL:${RCL_MICROROS}>>:rcl_interfaces::rcl_interfaces>
=======
"$<$<NOT:$<BOOL:${RCL_MICROROS}>>:${rcl_interfaces_TARGETS}>"
>>>>>>> dc07301 (Fix CMake generator expression)
# TODO(clalancette): rcl_logging_interface should be PRIVATE, but downstream depends on it for now
$<$<NOT:$<BOOL:${RCL_MICROROS}>>:rcl_logging_interface::rcl_logging_interface>
rcutils::rcutils
Expand Down
Loading