From 20d015ca985dde22a0ee345689d3f8edfd6247b5 Mon Sep 17 00:00:00 2001 From: mpa Date: Mon, 21 Oct 2013 06:12:25 +0000 Subject: [PATCH] - Add REQUIRED to optional products - SALOME_BUILD_DOC, SALOME_BUILD_TESTS should be independent in each module --- CMakeLists.txt | 12 ++++++------ SalomeKERNELConfig.cmake.in | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed390c814..b1f82d4ab 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ MARK_AS_ADVANCED(SALOME_LIGHT_ONLY SALOME_USE_LIBBATCH SALOME_USE_SIMAN SALOME_P # Exception: LibBatch is optional but is loaded first, as it can # give Python, Pthread and SWIG: IF(SALOME_USE_LIBBATCH) - FIND_PACKAGE(SalomeLibBatch) + FIND_PACKAGE(SalomeLibBatch REQUIRED) SALOME_LOG_OPTIONAL_PACKAGE(LibBatch SALOME_USE_LIBBATCH) ENDIF() @@ -88,7 +88,7 @@ FIND_PACKAGE(SalomeBoost REQUIRED) # ====================== IF(SALOME_USE_SIMAN) - FIND_PACKAGE(SalomeSIMANIO) + FIND_PACKAGE(SalomeSIMANIO REQUIRED) SALOME_LOG_OPTIONAL_PACKAGE(SIMANIO SALOME_USE_SIMAN) ADD_DEFINITIONS(-DWITH_SIMANIO) ENDIF() @@ -107,13 +107,13 @@ IF(SALOME_PACO_PARALLEL) ENDIF() IF(SALOME_BUILD_TESTS) ENABLE_TESTING() - FIND_PACKAGE(SalomeCppUnit) + FIND_PACKAGE(SalomeCppUnit REQUIRED) SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS) ENDIF() IF(SALOME_BUILD_DOC) - FIND_PACKAGE(SalomeDoxygen) - FIND_PACKAGE(SalomeGraphviz) - FIND_PACKAGE(SalomeSphinx) + FIND_PACKAGE(SalomeDoxygen REQUIRED) + FIND_PACKAGE(SalomeGraphviz REQUIRED) + FIND_PACKAGE(SalomeSphinx REQUIRED) SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC) SALOME_LOG_OPTIONAL_PACKAGE(Graphviz SALOME_BUILD_DOC) SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC) diff --git a/SalomeKERNELConfig.cmake.in b/SalomeKERNELConfig.cmake.in index b9387a0c7..884c54e07 100644 --- a/SalomeKERNELConfig.cmake.in +++ b/SalomeKERNELConfig.cmake.in @@ -4,10 +4,10 @@ # @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file # # Other stuff specific to this package: -# SALOME_USE_MPI - -# SALOME_BUILD_DOC - -# SALOME_BUILD_TESTS - -# SALOME_LIGHT_ONLY - +# SALOME_USE_MPI - ON if KERNEL is built with MPI support +# SALOME_KERNEL_BUILD_DOC - ON if documentation for KERNEL module has been built +# SALOME_KERNEL_BUILD_TESTS - ON if tests for KERNEL module has been built +# SALOME_LIGHT_ONLY - ON if SALOME is built in Light mode (no CORBA) ############################################################### # Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE @@ -60,8 +60,8 @@ IF(SALOME_USE_MPI) LIST(APPEND KERNEL_DEFINITIONS "@MPI_DEFINITIONS@") ENDIF() -SET(SALOME_BUILD_DOC @SALOME_BUILD_DOC@) -SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@) +SET(SALOME_KERNEL_BUILD_DOC @SALOME_BUILD_DOC@) +SET(SALOME_KERNEL_BUILD_TESTS @SALOME_BUILD_TESTS@) SET(SALOME_LIGHT_ONLY @SALOME_LIGHT_ONLY@) SET(SALOME_USE_LIBBATCH @SALOME_USE_LIBBATCH@) -- 2.39.2