fixed merge

Signed-off-by: Alejandro Hernandez Cordero <[email protected]>

Author: ahcorde

plugin_template/CMakeLists.txt

@@ -1,4 +1,4 @@
-# TODO (YourNameHere): This is not a working CMake Project! 
+# TODO (YourNameHere): This is not a working CMake Project!
 # Some assembly required for your plugin. (-:
 
 cmake_minimum_required(VERSION 3.10.2)
@@ -31,16 +31,12 @@ add_library(${PROJECT_NAME}
   src/template_subscriber.cpp
 )
 
-<<<<<<< HEAD
-ament_target_dependencies(${PROJECT_NAME} ${dependencies})
-=======
 target_link_libraries(${PROJECT_NAME} PRIVATE
   pluginlib::pluginlib
   ${point_cloud_interfaces_TARGETS}
   point_cloud_transport::point_cloud_transport
   rclcpp::rclcpp
 )
->>>>>>> e33a5e9 (Correctly export dependencies for downstream packages (#70))
 
 install(TARGETS ${PROJECT_NAME}
   ARCHIVE DESTINATION lib

zlib_point_cloud_transport/CMakeLists.txt

@@ -29,11 +29,6 @@ add_library(${PROJECT_NAME}
   src/manifest.cpp
 )
 
-<<<<<<< HEAD
-target_link_libraries(${PROJECT_NAME} ZLIB::ZLIB)
-
-ament_target_dependencies(${PROJECT_NAME} ${dependencies})
-=======
 target_link_libraries(${PROJECT_NAME} PRIVATE
   pluginlib::pluginlib
   ${point_cloud_interfaces_TARGETS}
@@ -46,7 +41,6 @@ target_include_directories(${PROJECT_NAME} PRIVATE
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
   "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
 )
->>>>>>> e33a5e9 (Correctly export dependencies for downstream packages (#70))
 
 install(TARGETS ${PROJECT_NAME}
   ARCHIVE DESTINATION lib

zstd_point_cloud_transport/CMakeLists.txt

@@ -26,17 +26,13 @@ add_library(${PROJECT_NAME}
   src/manifest.cpp
 )
 
-<<<<<<< HEAD
-target_link_libraries(${PROJECT_NAME} zstd)
-=======
 target_link_libraries(${PROJECT_NAME} PRIVATE
   pluginlib::pluginlib
   ${point_cloud_interfaces_TARGETS}
   point_cloud_transport::point_cloud_transport
   rclcpp::rclcpp
   zstd
 )
->>>>>>> e33a5e9 (Correctly export dependencies for downstream packages (#70))
 
 ament_target_dependencies(${PROJECT_NAME} ${dependencies})