Detection of the OpenCV is OFF by default.

This commit is contained in:
rnv 2013-09-17 12:19:05 +00:00
parent 868245ec86
commit f51526667e

View File

@ -65,7 +65,7 @@ OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ${SALOME_BUILD_TESTS})
# Advanced options: # Advanced options:
OPTION(SALOME_BUILD_GUI "Enable GUI" ON) 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) MARK_AS_ADVANCED(SALOME_BUILD_GUI SALOME_GEOM_USE_OPENCV)
@ -148,8 +148,10 @@ FIND_PACKAGE(SalomeCAS REQUIRED)
IF(SALOME_BUILD_GUI) IF(SALOME_BUILD_GUI)
# OpenCV # OpenCV
FIND_PACKAGE(SalomeOpenCV) IF(SALOME_GEOM_USE_OPENCV)
SALOME_LOG_OPTIONAL_PACKAGE(OpenCV SALOME_GEOM_USE_OPENCV) FIND_PACKAGE(SalomeOpenCV)
SALOME_LOG_OPTIONAL_PACKAGE(OpenCV SALOME_GEOM_USE_OPENCV)
ENDIF(SALOME_GEOM_USE_OPENCV)
ELSE() ELSE()
SET(SALOME_GEOM_USE_OPENCV OFF) SET(SALOME_GEOM_USE_OPENCV OFF)
ENDIF(SALOME_BUILD_GUI) ENDIF(SALOME_BUILD_GUI)