From de9b08347e538e3602c4b22e5d52297889b6bdd8 Mon Sep 17 00:00:00 2001 From: mpa Date: Wed, 13 Nov 2013 12:19:25 +0000 Subject: [PATCH] CMake: - delete kernel dependency because options are local now - enable cmake testing for have message "No tests were found" if module has not tests --- CMakeLists.txt | 7 +++++-- SalomeHexoticPLUGINConfig.cmake.in | 5 ++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c810e7..af063ce 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,11 +58,14 @@ SET(BUILD_SHARED_LIBS TRUE) LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") # User options -# (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 HexoticPLUGIN documentation" ON) +IF(SALOME_BUILD_TESTS) + ENABLE_TESTING() +ENDIF() + # Advanced options: OPTION(SALOME_BUILD_GUI "Enable HexoticPLUGIN GUI" ON) MARK_AS_ADVANCED(SALOME_BUILD_GUI) diff --git a/SalomeHexoticPLUGINConfig.cmake.in b/SalomeHexoticPLUGINConfig.cmake.in index 2616d2c..a08561b 100644 --- a/SalomeHexoticPLUGINConfig.cmake.in +++ b/SalomeHexoticPLUGINConfig.cmake.in @@ -52,9 +52,8 @@ SET(HexoticPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@") #### Now the specificities # Options exported by the package: -#SET(SALOME_HexoticPLUGIN_BUILD_TESTS @SALOME_BUILD_TESTS@) -SET(SALOME_HexoticPLUGIN_BUILD_DOC @SALOME_BUILD_DOC@) - +SET(SALOME_HexoticPLUGIN_BUILD_TESTS @SALOME_BUILD_TESTS@) +SET(SALOME_HexoticPLUGIN_BUILD_DOC @SALOME_BUILD_DOC@) # Advanced options SET(SALOME_HexoticPLUGIN_BUILD_GUI @SALOME_BUILD_GUI@) -- 2.39.2