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 ab6a18c887c9486a8f34969219a34d7976729a10..bfcee4583bbac392d05f3b83aa748057d6eeed65 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,15 +69,16 @@ ELSE()
   MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
 ENDIF()
 
-
 # User options
-# (some options have already been defined in KERNEL) 
 # ============
 OPTION(SALOME_BUILD_DOC "Generate SALOME GUI documentation" ON)
 OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
 OPTION(SALOME_PARAVIS_MINIMAL_CORBA "Build PARAVIS with a minimal CORBA interface" OFF)
 OPTION(SALOME_PARAVIS_BUILD_PLUGINS "Build PARAVIS plugins (MEDReader, etc ...)" ON)
 
+IF(SALOME_BUILD_TESTS)
+  ENABLE_TESTING()
+ENDIF()
 
 # Prerequisites
 # =============
@@ -98,11 +99,6 @@ IF(NOT SALOME_LIGHT_ONLY)
   FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
 ENDIF()
 
-#IF(SALOME_BUILD_TESTS)
-#  ENABLE_TESTING()
-#  FIND_PACKAGE(SalomeCppUnit)
-#  SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)  
-#ENDIF()
 IF(SALOME_BUILD_DOC)
   FIND_PACKAGE(SalomeDoxygen)
   FIND_PACKAGE(SalomeGraphviz)

diff --git a/SalomePARAVISConfig.cmake.in b/SalomePARAVISConfig.cmake.in
index 68d5e5acdfeaccaa58d156b35e5047032846cc4e..05195b0525a3fea6385c88eeff4408df4929f292 100644 (file)
--- a/SalomePARAVISConfig.cmake.in
+++ b/SalomePARAVISConfig.cmake.in
@@ -52,8 +52,8 @@ SET(PARAVIS_DEFINITIONS "@KERNEL_DEFINITIONS@")
 #### Now the specificities
 
 # Options exported by the package:
-SET(SALOME_BUILD_DOC   @SALOME_BUILD_DOC@)
-SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@)
+SET(SALOME_PARAVIS_BUILD_DOC   @SALOME_BUILD_DOC@)
+SET(SALOME_PARAVIS_BUILD_TESTS @SALOME_BUILD_TESTS@)
 SET(SALOME_LIGHT_ONLY  @SALOME_LIGHT_ONLY@)
 
 # Advanced options