From: ana <ana@opencascade.com>
Date: Fri, 15 May 2015 09:00:16 +0000 (+0300)
Subject: CMake procedure: Detecting OpenCV third-party product on Windows
X-Git-Tag: V7_6_0rc1~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=10ae356a871648f90ee45ddc9dc002f79bbf0bf6;p=modules%2Fgeom.git

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 8556e961d..63932fea4 100644
--- 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)