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 f2d0addc47fcd3a092053d4a10cf784b33a87261..445a93916d9326272045f4473d5c44ff6d44d7b9 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,12 +57,14 @@ SET(BUILD_SHARED_LIBS TRUE)
 # Local macros:
 LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
 
-# User options
-# (some options have already been defined in KERNEL) 
+# User options 
 # ============
-# 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 PYCALCULATOR documentation" ON)
   
+IF(SALOME_BUILD_TESTS)
+  ENABLE_TESTING()
+ENDIF()
 IF(SALOME_BUILD_DOC)
   FIND_PACKAGE(SalomeDoxygen)
   SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC)

diff --git a/SalomePYCALCULATORConfig.cmake.in b/SalomePYCALCULATORConfig.cmake.in
index b5c8ad8d60562ea1d51a630e40f9363369da4da8..811cf2b49e5fdc947c06c43dda2725037f2c3122 100644 (file)
--- a/SalomePYCALCULATORConfig.cmake.in
+++ b/SalomePYCALCULATORConfig.cmake.in
@@ -53,7 +53,7 @@ ENDIF()
 #### Now the specificities
 
 # Options exported by the package:
-#SET(SALOME_PYCALCULATOR_BUILD_TESTS @SALOME_BUILD_TESTS@)
+SET(SALOME_PYCALCULATOR_BUILD_TESTS @SALOME_BUILD_TESTS@)
 SET(SALOME_PYCALCULATOR_BUILD_DOC   @SALOME_BUILD_DOC@)
 
 # Level 1 prerequisites: