From 29ab297b129a5898da8701958af80a08890e9727 Mon Sep 17 00:00:00 2001 From: mpa Date: Wed, 13 Nov 2013 12:20:12 +0000 Subject: [PATCH] CMake: - delete kernel dependency because options are local now - enable cmake testing for have message "No tests were found" if module has not tests --- CMakeLists.txt | 7 +++++-- SalomeJOBMANAGERConfig.cmake.in | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6045bf3..73959a0 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,11 +58,14 @@ 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 JOBMANAGER documentation" ON) +IF(SALOME_BUILD_TESTS) + ENABLE_TESTING() +ENDIF() + ## ## From KERNEL: ## diff --git a/SalomeJOBMANAGERConfig.cmake.in b/SalomeJOBMANAGERConfig.cmake.in index 5f92a0b..0a11530 100644 --- a/SalomeJOBMANAGERConfig.cmake.in +++ b/SalomeJOBMANAGERConfig.cmake.in @@ -52,7 +52,7 @@ SET(JOBMANAGER_DEFINITIONS "@GUI_DEFINITIONS@") #### Now the specificities # Options exported by the package: -#SET(SALOME_JOBMANAGER_BUILD_TESTS @SALOME_BUILD_TESTS@) +SET(SALOME_JOBMANAGER_BUILD_TESTS @SALOME_BUILD_TESTS@) SET(SALOME_JOBMANAGER_BUILD_DOC @SALOME_BUILD_DOC@) # Level 1 prerequisites: -- 2.39.2