CMake:

- delete kernel dependency because options are local now
- enable cmake testing for have message "No tests were
found" if module has not tests

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b882ba93181ba4d846fe66d1ae6efcb1ca94aaa..7fe7bf22b2ef17bcb11202bbb80781b9abe2d837 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,10 +58,13 @@ 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_DOC "Generate SALOME HEXABLOCKPLUGIN documentation" ON) #for use in the future
-#OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) #for use in the future
+OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
+
+IF(SALOME_BUILD_TESTS)
+  ENABLE_TESTING()
+ENDIF()
 
 # Advanced options:
 OPTION(SALOME_BUILD_GUI "Enable GUI" ON)
@@ -80,7 +83,6 @@ FIND_PACKAGE(SalomeBoost REQUIRED)
 FIND_PACKAGE(SalomeOmniORB REQUIRED)
 FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
 
-
 # Find GUI (optional)
 # ===========
 IF(SALOME_BUILD_GUI)

diff --git a/SalomeHEXABLOCKPLUGINConfig.cmake.in b/SalomeHEXABLOCKPLUGINConfig.cmake.in
index 1aa1ce4aba710d936b536657500e6742044d2f70..0bd9b7bf392eaa156e9e6be231f5b2b493ab6e28 100644 (file)
--- a/SalomeHEXABLOCKPLUGINConfig.cmake.in
+++ b/SalomeHEXABLOCKPLUGINConfig.cmake.in
@@ -52,7 +52,7 @@ SET(HEXABLOCKPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@")
 #### Now the specificities
 
 # Options exported by the package:
-#SET(SALOME_HEXABLOCK_BUILD_TESTS @SALOME_BUILD_TESTS@)
+SET(SALOME_HEXABLOCK_BUILD_TESTS @SALOME_BUILD_TESTS@)
 #SET(SALOME_HEXABLOCK_BUILD_DOC   @SALOME_BUILD_DOC@)
 
 # Advanced options