From 10ae356a871648f90ee45ddc9dc002f79bbf0bf6 Mon Sep 17 00:00:00 2001 From: ana Date: Fri, 15 May 2015 12:00:16 +0300 Subject: [PATCH] CMake procedure: Detecting OpenCV third-party product on Windows --- adm_local/cmake_files/FindSalomeOpenCV.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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)