OpenCV 4 compatibility

[tools/configuration.git] / cmake / FindOpenCV.cmake

diff --git a/cmake/FindOpenCV.cmake b/cmake/FindOpenCV.cmake
index ac601b61c56c0839f03617c9f5152ba2e668b733..7be670b4520fe34191b62b493e20a616a03b1e37 100644 (file)
--- a/cmake/FindOpenCV.cmake
+++ b/cmake/FindOpenCV.cmake
@@ -1,8 +1,5 @@
 #########################################################################
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -32,14 +29,9 @@ IF(NOT OpenCV_FIND_QUIETLY)
   MESSAGE(STATUS "Check for OpenCV ...")
 ENDIF()
 
-FIND_PATH(OpenCV_INCLUDE_DIRS cv.h PATH_SUFFIXES opencv)
-IF(OpenCV_INCLUDE_DIRS)
-  SET(_OpenCV_INCLUDE_DIR_TMP "${OpenCV_INCLUDE_DIRS}/../opencv2")
-  GET_FILENAME_COMPONENT(_OpenCV_INCLUDE_DIR_TMP "${_OpenCV_INCLUDE_DIR_TMP}" REALPATH)
-  LIST(APPEND OpenCV_INCLUDE_DIRS ${_OpenCV_INCLUDE_DIR_TMP})
-ENDIF()
+FIND_PATH(OpenCV_INCLUDE_DIRS opencv2/core.hpp)
 
-SET(OpenCV_LIB_COMPONENTS videostab;video;ts;superres;stitching;photo;ocl;objdetect;ml;legacy;imgproc;highgui;gpu;flann;features2d)
+SET(OpenCV_LIB_COMPONENTS videostab;video;ts;superres;stitching;photo;ocl;objdetect;ml;legacy;imgproc;highgui;gpu;flann;features2d;core;objdetect;imgcodecs;shape)
 
 FOREACH(_compo ${OpenCV_LIB_COMPONENTS})
   FIND_LIBRARY(OpenCV_${_compo} opencv_${_compo})
@@ -48,7 +40,10 @@ FOREACH(_compo ${OpenCV_LIB_COMPONENTS})
   ENDIF()
 ENDFOREACH()
 IF(OpenCV_LIBRARIES AND OpenCV_INCLUDE_DIRS)
-  SET(OpenCV_FOUND 1)
+  IF(NOT OpenCV_LIBS)
+    SET(OpenCV_LIBS ${OpenCV_LIBRARIES})
+  ENDIF()
+  SET(OpenCV_FOUND 1)  
 
   IF(NOT OpenCV_FIND_QUIETLY)
     MESSAGE("OpenCV found !")