Merge branch 'master' into AM-777/station_topic

Aaron Roller · web-flow · commit 8c5f366a485c · 2021-08-23T16:47:21.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@ find_package(catkin REQUIRED COMPONENTS
   pcl_conversions
   )
 
-find_package(OpenCV REQUIRED)
+find_package(OpenCV EXACT 3.3.1 REQUIRED)
 find_package(Eigen3 REQUIRED)
 
 find_package(PkgConfig REQUIRED)

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ find_package(catkin REQUIRED COMPONENTS`
`21`	`21`	`pcl_conversions`
`22`	`22`	`)`
`23`	`23`
`24`		`-find_package(OpenCV REQUIRED)`
	`24`	`+find_package(OpenCV EXACT 3.3.1 REQUIRED)`
`25`	`25`	`find_package(Eigen3 REQUIRED)`
`26`	`26`
`27`	`27`	`find_package(PkgConfig REQUIRED)`