- define variable SALOME_BUILD_TESTS and find CppUnit for adding tests to this module
This commit is contained in:
mpa 2013-11-06 10:36:07 +00:00
parent 2d9205e89f
commit b0dd4fd16f
2 changed files with 7 additions and 2 deletions

View File

@ -60,7 +60,7 @@ LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
# User options # User options
# (some options have already been defined in KERNEL) # (some options have already been defined in KERNEL)
# ============ # ============
# OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) For use in the future OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
OPTION(SALOME_BUILD_DOC "Generate SALOME SMESH documentation" ON) OPTION(SALOME_BUILD_DOC "Generate SALOME SMESH documentation" ON)
# Advanced options: # Advanced options:
@ -108,7 +108,11 @@ FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C)
IF(SALOME_USE_MPI) IF(SALOME_USE_MPI)
FIND_PACKAGE(SalomeMPI) # needed for doc generation by Sphinx FIND_PACKAGE(SalomeMPI) # needed for doc generation by Sphinx
ENDIF() ENDIF()
IF(SALOME_BUILD_TESTS)
ENABLE_TESTING()
FIND_PACKAGE(SalomeCppUnit)
SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)
ENDIF()
IF(SALOME_BUILD_DOC) IF(SALOME_BUILD_DOC)
FIND_PACKAGE(SalomeDoxygen) FIND_PACKAGE(SalomeDoxygen)
FIND_PACKAGE(SalomeSphinx) FIND_PACKAGE(SalomeSphinx)

View File

@ -53,6 +53,7 @@ SET(SMESH_DEFINITIONS "@GEOM_DEFINITIONS@")
# Options exported by the package: # Options exported by the package:
SET(SALOME_SMESH_BUILD_DOC @SALOME_BUILD_DOC@) SET(SALOME_SMESH_BUILD_DOC @SALOME_BUILD_DOC@)
SET(SALOME_SMESH_BUILD_TESTS @SALOME_BUILD_TESTS@)
# Advanced options # Advanced options
SET(SALOME_SMESH_BUILD_GUI @SALOME_BUILD_GUI@) SET(SALOME_SMESH_BUILD_GUI @SALOME_BUILD_GUI@)