Copyright update 2022

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

diff --git a/cmake/FindSalomeOpenCV.cmake b/cmake/FindSalomeOpenCV.cmake
index bcab5e7ae5d29dfe55389286bb8c9d58c3d1dcdb..83ebdaeff495108c6487b6df89180d870d5fa8cb 100644 (file)
--- a/cmake/FindSalomeOpenCV.cmake
+++ b/cmake/FindSalomeOpenCV.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2022  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
@@ -23,16 +23,16 @@
 #
 #  !! Please read the generic detection procedure in SalomeMacros.cmake !!
 #
-SET(UpCount 2)
 
-IF (WIN32)
-  SET(UpCount 0)
-ENDIF (WIN32)
-
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OpenCV OpenCV_DIR ${UpCount})
-
-#MARK_AS_ADVANCED()
+SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OpenCV OpenCV_INCLUDE_DIRS 1)
 
 IF(OpenCV_FOUND) 
   SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${OpenCV_LIBRARIES})
+  IF(NOT OPENCV_INCLUDE_DIR AND OpenCV_INCLUDE_DIRS)
+    SET(OPENCV_INCLUDE_DIR ${OpenCV_INCLUDE_DIRS})
+  ENDIF()
+  MARK_AS_ADVANCED(FORCE OPENCV_INCLUDE_DIR OpenCV_LIBRARIES)
+  # RNV: Why opencv-2.4.13.5 stores *_FOUND variables into CACHE ???
+  UNSET(OpenCV_FOUND CACHE)
+  UNSET(OPENCV_FOUND CACHE)
 ENDIF()