Undo some other misc changes

CMakeLists.txt

@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.16)
 project(mrover VERSION 2024.0.0 LANGUAGES CXX)
 
 # Generate compile_commands.json for clangd
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # Generate compile_commands.json for clangd

starter_project/autonomy/AutonomyStarterProject.cmake

@@ -18,7 +18,7 @@ add_executable(starter_project_perception ${STARTER_PROJECT_PERCEPTION_SOURCES})
 # Ensure that our project builds after message generation
 add_dependencies(starter_project_perception ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
 # Link needed libraries
-target_link_libraries(starter_project_perception ${catkin_LIBRARIES} opencv_core opencv_objdetect)
+target_link_libraries(starter_project_perception ${catkin_LIBRARIES} ${OpenCV_LIBS})
 # Include needed directories
 target_include_directories(starter_project_perception PUBLIC ${catkin_INCLUDE_DIRS})
 

starter_project/autonomy/src/perception.cpp

@@ -47,7 +47,7 @@ namespace mrover {
     }
 
     void Perception::findTagsInImage(cv::Mat const& image, std::vector<StarterProjectTag>& tags) { // NOLINT(*-convert-member-functions-to-static)
-        // hint: take a look at OpenCV's documentation for the detectMarkers function that can be called on mTagDetector
+        // hint: take a look at OpenCV's documentation for the detectMarkers function
         // hint: you have mTagDictionary, mTagCorners, mTagIds, and mTagDetectorParams member variables already defined!
         // hint: write and use the "getCenterFromTagCorners" and "getClosenessMetricFromTagCorners" functions
 

starter_project/autonomy/src/perception.hpp

@@ -8,8 +8,8 @@
 #include <vector>
 
 // OpenCV Headers, cv namespace
+#include <opencv2/aruco.hpp>
 #include <opencv2/core/mat.hpp>
-#include <opencv2/objdetect.hpp>
 
 // ROS Headers, ros namespace
 #include <ros/node_handle.h>