From: rnv Date: Tue, 17 Sep 2013 12:19:05 +0000 (+0000) Subject: Detection of the OpenCV is OFF by default. X-Git-Tag: BR_hydro_v_0_3_1~130 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f51526667e93003b41126c9a347725152a7f72c4;p=modules%2Fgeom.git Detection of the OpenCV is OFF by default. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d85837a5..65c4e68ff 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,7 @@ OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ${SALOME_BUILD_TESTS}) # Advanced options: OPTION(SALOME_BUILD_GUI "Enable GUI" ON) -OPTION(SALOME_GEOM_USE_OPENCV "Enable shape recognition from picture" ON) +OPTION(SALOME_GEOM_USE_OPENCV "Enable shape recognition from picture" OFF) MARK_AS_ADVANCED(SALOME_BUILD_GUI SALOME_GEOM_USE_OPENCV) @@ -148,8 +148,10 @@ FIND_PACKAGE(SalomeCAS REQUIRED) IF(SALOME_BUILD_GUI) # OpenCV - FIND_PACKAGE(SalomeOpenCV) - SALOME_LOG_OPTIONAL_PACKAGE(OpenCV SALOME_GEOM_USE_OPENCV) + IF(SALOME_GEOM_USE_OPENCV) + FIND_PACKAGE(SalomeOpenCV) + SALOME_LOG_OPTIONAL_PACKAGE(OpenCV SALOME_GEOM_USE_OPENCV) + ENDIF(SALOME_GEOM_USE_OPENCV) ELSE() SET(SALOME_GEOM_USE_OPENCV OFF) ENDIF(SALOME_BUILD_GUI)