From 81193df70c4824acad1e5d8fb2e3cc3567bf05b2 Mon Sep 17 00:00:00 2001 From: mpa Date: Wed, 13 Nov 2013 12:17:34 +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 | 8 +++++--- SalomeHEXABLOCKPLUGINConfig.cmake.in | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b882ba..7fe7bf2 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,10 +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_DOC "Generate SALOME HEXABLOCKPLUGIN documentation" ON) #for use in the future -#OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) #for use in the future +OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) + +IF(SALOME_BUILD_TESTS) + ENABLE_TESTING() +ENDIF() # Advanced options: OPTION(SALOME_BUILD_GUI "Enable GUI" ON) @@ -80,7 +83,6 @@ FIND_PACKAGE(SalomeBoost REQUIRED) FIND_PACKAGE(SalomeOmniORB REQUIRED) FIND_PACKAGE(SalomeOmniORBPy REQUIRED) - # Find GUI (optional) # =========== IF(SALOME_BUILD_GUI) diff --git a/SalomeHEXABLOCKPLUGINConfig.cmake.in b/SalomeHEXABLOCKPLUGINConfig.cmake.in index 1aa1ce4..0bd9b7b 100644 --- a/SalomeHEXABLOCKPLUGINConfig.cmake.in +++ b/SalomeHEXABLOCKPLUGINConfig.cmake.in @@ -52,7 +52,7 @@ SET(HEXABLOCKPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@") #### Now the specificities # Options exported by the package: -#SET(SALOME_HEXABLOCK_BUILD_TESTS @SALOME_BUILD_TESTS@) +SET(SALOME_HEXABLOCK_BUILD_TESTS @SALOME_BUILD_TESTS@) #SET(SALOME_HEXABLOCK_BUILD_DOC @SALOME_BUILD_DOC@) # Advanced options -- 2.39.2