Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ros2 devel #90

Open
wants to merge 27 commits into
base: ros2
Choose a base branch
from
Open
Changes from 1 commit
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
Prev Previous commit
code review changes
  • Loading branch information
pmusau17 committed Sep 16, 2021
commit 251dd483066078d926cf8721f412f7bd4039651c
17 changes: 8 additions & 9 deletions ar_track_alvar/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@ find_package(image_transport REQUIRED)
find_package(resource_retriever REQUIRED)
find_package(cv_bridge REQUIRED)
find_package(perception_pcl REQUIRED)
find_package(pcl_ros)
find_package(pcl_conversions REQUIRED)
find_package(ar_track_alvar_msgs REQUIRED)
find_package(std_msgs REQUIRED)
@@ -27,6 +26,7 @@ find_package(geometry_msgs REQUIRED)
find_package(rosbag2_bag_v2_plugins REQUIRED)
find_package(visualization_msgs REQUIRED)
find_package(PCL REQUIRED QUIET COMPONENTS common io)
find_package(PCL REQUIRED)
find_package(Eigen3 REQUIRED)
find_package(tinyxml_vendor REQUIRED)

@@ -40,7 +40,6 @@ set(dependencies
OpenCV
tf2_ros
tf2
pcl_ros
pcl_conversions
std_msgs
tinyxml_vendor
@@ -94,40 +93,40 @@ add_library(${PROJECT_NAME}
src/Util.cpp
)

target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBRARIES} tinyxml)
target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBRARIES} ${PCL_LIBRARIES} tinyxml)
ament_target_dependencies(ar_track_alvar ${dependencies})

add_library(kinect_filtering src/kinect_filtering.cpp)
ament_target_dependencies(kinect_filtering ${dependencies})


add_library(medianFilter src/medianFilter.cpp)
target_link_libraries(medianFilter ar_track_alvar ${TinyXML_LIBRARIES})
target_link_libraries(medianFilter ar_track_alvar ${PCL_LIBRARIES} ${TinyXML_LIBRARIES})
ament_target_dependencies(medianFilter ${dependencies})

add_executable(individualMarkers nodes/IndividualMarkers.cpp)
target_link_libraries(individualMarkers ar_track_alvar kinect_filtering ${TinyXML_LIBRARIES})
target_link_libraries(individualMarkers ar_track_alvar kinect_filtering ${PCL_LIBRARIES} ${TinyXML_LIBRARIES})
ament_target_dependencies(individualMarkers ${dependencies})

add_executable(individualMarkersNoKinect nodes/IndividualMarkersNoKinect.cpp)
target_link_libraries(individualMarkersNoKinect ar_track_alvar)
ament_target_dependencies(individualMarkersNoKinect ${dependencies})

add_executable(trainMarkerBundle nodes/TrainMarkerBundle.cpp)
target_link_libraries(trainMarkerBundle ar_track_alvar ${TinyXML_LIBRARIES})
target_link_libraries(trainMarkerBundle ar_track_alvar ${PCL_LIBRARIES} ${TinyXML_LIBRARIES})
ament_target_dependencies(trainMarkerBundle ${dependencies})


add_executable(findMarkerBundles nodes/FindMarkerBundles.cpp)
target_link_libraries(findMarkerBundles ar_track_alvar kinect_filtering medianFilter ${TinyXML_LIBRARIES})
target_link_libraries(findMarkerBundles ar_track_alvar kinect_filtering medianFilter ${PCL_LIBRARIES} ${TinyXML_LIBRARIES})
ament_target_dependencies(findMarkerBundles ${dependencies})

add_executable(findMarkerBundlesNoKinect nodes/FindMarkerBundlesNoKinect.cpp)
target_link_libraries(findMarkerBundlesNoKinect ar_track_alvar ${TinyXML_LIBRARIES})
target_link_libraries(findMarkerBundlesNoKinect ar_track_alvar ${PCL_LIBRARIES} ${TinyXML_LIBRARIES})
ament_target_dependencies(findMarkerBundlesNoKinect ${dependencies})

add_executable(createMarker src/SampleMarkerCreator.cpp)
target_link_libraries(createMarker ar_track_alvar ${TinyXML_LIBRARIES})
target_link_libraries(createMarker ar_track_alvar ${PCL_LIBRARIES} ${TinyXML_LIBRARIES})
ament_target_dependencies(createMarker ${dependencies})