From 5e524f84b2f07784f3b987b83cde142cab2da929 Mon Sep 17 00:00:00 2001 From: mpa Date: Wed, 13 Nov 2013 12:24:31 +0000 Subject: [PATCH 1/1] 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 | 8 +++++--- SalomePYCALCULATORConfig.cmake.in | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2d0add..445a939 100755 --- 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 b5c8ad8..811cf2b 100644 --- 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: -- 2.39.2