summarylogtreecommitdiffstats
path: root/opencv_and_opencv2-opt.patch
blob: 912986b6d7021172896b60dee5c5b21ed7dc8c64 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
--- a/cmakemodules/script_opencv.cmake
+++ b/cmakemodules/script_opencv.cmake
@@ -11,7 +11,7 @@
 # Use CMAKE module if opencv's not been detected yet:
 IF(NOT CMAKE_MRPT_HAS_OPENCV)
 	# 1st: Try to find OpenCV config file (NO_MODULE: Don't find a module, but OpenCVConfig.cmake):
-	FIND_PACKAGE(OpenCV  QUIET NO_MODULE)
+	FIND_PACKAGE(OpenCV 2 QUIET NO_MODULE)
 	IF(OpenCV_FOUND)
 		SET(MRPT_OPENCV_VERSION ${OpenCV_VERSION})
 		SET(OpenCV_LIBRARIES ${OpenCV_LIBS})
@@ -48,7 +48,7 @@
 
 IF(NOT CMAKE_MRPT_HAS_OPENCV)
 	# 3rd: OK, let's use the module:
-	FIND_PACKAGE(OpenCV)
+	FIND_PACKAGE(OpenCV 2)
 	IF(OpenCV_FOUND)
 		# MRPT_OPENCV_VERSION
 		IF($ENV{VERBOSE})