CMake procedure: Detecting OpenCV third-party product on Windows

diff --git a/adm_local/cmake_files/FindSalomeOpenCV.cmake b/adm_local/cmake_files/FindSalomeOpenCV.cmake
index 8556e961da57d1eb75036a10f59fe6253b06bd8a..63932fea42987990ddccc039ca49b205bf1f0fe5 100644 (file)
--- a/adm_local/cmake_files/FindSalomeOpenCV.cmake
+++ b/adm_local/cmake_files/FindSalomeOpenCV.cmake
@@ -23,7 +23,14 @@
 #
 #  !! Please read the generic detection procedure in SalomeMacros.cmake !!
 #
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OpenCV OpenCV_DIR 2)
+SET(UpCount 2)
+
+IF (WIN32)
+  SET(UpCount 0)
+ENDIF (WIN32)
+
+SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OpenCV OpenCV_DIR ${UpCount})
+
 #MARK_AS_ADVANCED()
 
 IF(OpenCV_FOUND)