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 57cb7113a7d936c0744f87ede591fd7a0bc279c8..73912044d3063089005e38e68c3d5f6eb8cc0376 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,11 +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_TESTS "Build SALOME tests" ON) #For use in the future
+OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
 OPTION(SALOME_BUILD_DOC "Generate SALOME HELLO 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/SalomeHELLOConfig.cmake.in b/SalomeHELLOConfig.cmake.in
index f65d716125838c18483ae75a83a73490bb039a86..5dd1aae16469dd828232b53109ea492d897f5312 100644 (file)
--- a/SalomeHELLOConfig.cmake.in
+++ b/SalomeHELLOConfig.cmake.in
@@ -52,8 +52,8 @@ SET(HELLO_DEFINITIONS "@GUI_DEFINITIONS@")
 #### Now the specificities
 
 # Options exported by the package:
-#SET(SALOME_HELLO_BUILD_TESTS @SALOME_BUILD_TESTS@)
-SET(SALOME_HELLO_BUILD_DOC    @SALOME_BUILD_DOC@)
+SET(SALOME_HELLO_BUILD_TESTS @SALOME_BUILD_TESTS@)
+SET(SALOME_HELLO_BUILD_DOC   @SALOME_BUILD_DOC@)
 
 # Level 1 prerequisites:
 SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@")