From: bruneton Date: Wed, 11 Sep 2013 09:27:24 +0000 (+0000) Subject: CMake: updated doc to reflect KERNEL_DEFINITIONS and removal of MPI detection X-Git-Tag: V7_4_0a1~6 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=118ff7a3b4b8be9218ee3a038265965adbca3961;p=tools%2Fdocumentation.git CMake: updated doc to reflect KERNEL_DEFINITIONS and removal of MPI detection in GUI. --- diff --git a/dev/cmake/source/config.rst b/dev/cmake/source/config.rst index 0b2ebcf..a231b67 100644 --- a/dev/cmake/source/config.rst +++ b/dev/cmake/source/config.rst @@ -136,6 +136,7 @@ The user options, and the directories of the level 1 prerequisites (i.e. direct # Include directories SET_AND_CHECK(GUI_INCLUDE_DIRS "${GUI_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") + SET(GUI_DEFINITIONS "@KERNEL_DEFINITIONS@") # Options exported by the package: SET(SALOME_USE_MPI @SALOME_USE_MPI@) diff --git a/dev/cmake/source/pkg.rst b/dev/cmake/source/pkg.rst index 4b020b0..dde67b5 100644 --- a/dev/cmake/source/pkg.rst +++ b/dev/cmake/source/pkg.rst @@ -16,6 +16,8 @@ and using them ensures future compatibility with newer versions of CMake. Second, the implementation of the detection process relies exclusively on the XYZ_ROOT_DIR variable giving the installation path of the package. This means the user compiling SALOME should not have to set anything else than those XYZ variables (no PATH override, no LD_LIBRARY_PATH override should be necessary). This is not strictly always possible, but should enforce as often as possible. +Finally only the direct dependencies of a module should be explicitly detected: for example GUI has no source code which uses MPI functionalities. Hence GUI does not detect the MPI package. However if KERNEL was compiled with MPI, then some of the information (include directories, definitions, ...) needs to be propagated to GUI (in this case for example, MPI needs to be in the list of include directories, since GUI include KERNEL headers, which themselves include MPI headers). This is done exclusively through the variables exposed in the KERNEL configuration file: KERNEL_INCLUDE_DIRS, KERNEL_DEFINITIONS. + Root dir variables and priority order -------------------------------------