From 99f560d6373ef0e7f515dcbf53d027b81de220c2 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 6 Nov 2013 07:36:08 +0000 Subject: [PATCH] Build Curve Creator optionally (OFF by default) --- CMakeLists.txt | 15 ++++++++++++--- src/CMakeLists.txt | 12 +++++++++++- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d6966355..4fa376399 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,11 +70,14 @@ OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) OPTION(SALOME_BUILD_GUI "Enable GUI" ON) CMAKE_DEPENDENT_OPTION(SALOME_GEOM_USE_OPENCV "Enable shape recognition from picture" OFF "SALOME_BUILD_GUI" OFF) -MARK_AS_ADVANCED(SALOME_BUILD_GUI SALOME_GEOM_USE_OPENCV) +CMAKE_DEPENDENT_OPTION(SALOME_GEOM_BUILD_CC "Enable curve creator (experimental)" OFF + "SALOME_BUILD_GUI" OFF) +MARK_AS_ADVANCED(SALOME_BUILD_GUI SALOME_GEOM_USE_OPENCV SALOME_GEOM_BUILD_CC) # Debug options (!!! FOR DEVELOPERS ONLY !!! TO BE REMOVED LATER !!!) IF(CMAKE_BUILD_TYPE MATCHES "^Debug$") - OPTION(SALOME_GEOM_DEBUG_CC "Debug curve creator" OFF) + CMAKE_DEPENDENT_OPTION(SALOME_GEOM_DEBUG_CC "Debug curve creator" OFF + "SALOME_GEOM_BUILD_CC" OFF) MARK_AS_ADVANCED(SALOME_GEOM_DEBUG_CC) IF(SALOME_GEOM_DEBUG_CC) @@ -241,7 +244,7 @@ SET(_${PROJECT_NAME}_exposed_targets GEOMArchimede BREPExport BREPImport BlockFix GEOMbasic GEOMAlgo GEOMClient GEOMImpl GEOMUtils GEOMEngine GEOM_SupervEngine IGESExport IGESImport GEOMSketcher SalomeIDLGEOM STEPExport STEPImport STLExport ShHealOper XAO AdvancedEngine OCC2VTK - VTKExport CurveCreator + VTKExport ) IF(SALOME_BUILD_GUI) LIST(APPEND _${PROJECT_NAME}_exposed_targets @@ -257,6 +260,12 @@ IF(SALOME_GEOM_USE_OPENCV) ) ENDIF(SALOME_GEOM_USE_OPENCV) +IF(SALOME_GEOM_BUILD_CC) + LIST(APPEND _${PROJECT_NAME}_exposed_targets + CurveCreator + ) +ENDIF(SALOME_GEOM_BUILD_CC) + # Add all targets to the build-tree export set EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ddce7c14f..aaa52fd8e 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,9 +24,18 @@ SET(SUBDIRS_COMMON ARCHIMEDE BlockFix GEOMAlgo SKETCHER GEOM BREPExport BREPImport IGESExport IGESImport STEPExport STEPImport STLExport ShHealOper GEOMUtils XAO XAO_Swig GEOMImpl GEOM_I GEOMClient GEOM_I_Superv GEOM_SWIG GEOM_PY - AdvancedEngine OCC2VTK VTKExport CurveCreator + AdvancedEngine OCC2VTK VTKExport ) +## +# Curve creator +## +IF(SALOME_GEOM_BUILD_CC) + SET(SUBDIRS_CC + CurveCreator + ) +ENDIF() + ## # OPENCV ## @@ -52,6 +61,7 @@ ENDIF() SET(SUBDIRS ${SUBDIRS_COMMON} ${SUBDIRS_OPENCV} + ${SUBDIRS_CC} ${SUBDIRS_GUI} ) -- 2.39.2