CMake:

- enable cmake testing for have message "No tests were
found" if module has not tests

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f20aec973ad086b12771001fc9e83fc83b6e3f01..11bba767d605ad6f31e108e27cf8e55a15a11a0e 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,12 +64,15 @@ FIND_PACKAGE(SalomePython REQUIRED)
 FIND_PACKAGE(SalomeOmniORB REQUIRED)
 FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
 
-# 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 CALCULATOR documentation" ON)
 
+IF(SALOME_BUILD_TESTS)
+  ENABLE_TESTING()
+ENDIF()
+
 # Find MED
 # ===========
 

diff --git a/SalomeCALCULATORConfig.cmake.in b/SalomeCALCULATORConfig.cmake.in
index b0d6dc4333c13da4655fd3b722aeae9d9dbbc0e7..82498ec4d590c7f6eb7b8b3795f27b671f0fffb6 100644 (file)
--- a/SalomeCALCULATORConfig.cmake.in
+++ b/SalomeCALCULATORConfig.cmake.in
@@ -52,8 +52,8 @@ SET(CALCULATOR_DEFINITIONS "@MED_DEFINITIONS@")
 #### Now the specificities
 
 # Options exported by the package:
-#SET(SALOME_CALCULATOR_BUILD_TESTS @SALOME_BUILD_TESTS@)
-SET(SALOME_CALCULATOR_BUILD_DOC    @SALOME_BUILD_DOC@)
+SET(SALOME_CALCULATOR_BUILD_TESTS @SALOME_BUILD_TESTS@)
+SET(SALOME_CALCULATOR_BUILD_DOC   @SALOME_BUILD_DOC@)
 
 # Level 1 prerequisites:
 SET_AND_CHECK(MED_ROOT_DIR_EXP  "@PACKAGE_MED_ROOT_DIR@")