CMake: minor modif: SALOME_USE_MPI inherits from KERNEL when not standalone.

KERNEL_INCLUDE_DIRS loaded in the root CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 761e53ccffed1f16f6ad65f5beecd7418b4aeeda..bf211ec43001f1afef41f768c94574d194791b28 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,12 +46,16 @@ SET(VERSION_DEV "0")
 # Kernel detection comes before user options to be
 # able to take previous values of SALOME_USE_MPI, SALOME_BUILD_DOC, etc ...
 #
+SET(_default_MPI OFF)
 IF(NOT SALOME_MED_STANDALONE)
   SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
   IF(EXISTS ${KERNEL_ROOT_DIR})
     LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
     INCLUDE(SalomeMacros)
     FIND_PACKAGE(SalomeKERNEL REQUIRED)
+    ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
+    INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS})
+    SET(_default_MPI ${SALOME_USE_MPI}) 
   ELSE(EXISTS ${KERNEL_ROOT_DIR})
     MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR or turn option SALOME_MED_STANDALONE to ON !")
   ENDIF(EXISTS ${KERNEL_ROOT_DIR})
@@ -72,13 +76,13 @@ OPTION(SALOME_MED_MICROMED "Build MED without MED file dependancy." OFF)
 OPTION(SALOME_MED_ENABLE_PYTHON "Build PYTHON bindings." ON)
 OPTION(SALOME_MED_ENABLE_PARTITIONER "Build MEDPartitioner." ON)
 OPTION(SALOME_MED_ENABLE_RENUMBER "Build Renumber." ON)
-OPTION(SALOME_USE_MPI "To build ParaMEDMEM." OFF)
+OPTION(SALOME_USE_MPI "(Use MPI containers) - For MED this triggers the build of ParaMEDMEM." ${_default_MPI})
 OPTION(SALOME_BUILD_GUI "Build GUI of MED." ON)
 OPTION(SALOME_BUILD_TESTS "Build MED tests." ON)
 OPTION(SALOME_BUILD_DOC "Build MED doc." ON)
-CMAKE_DEPENDENT_OPTION(SALOME_MED_PARTITIONER_METIS "Enable metis graph librarie in MEDPartitioner." ON "SALOME_MED_ENABLE_PARTITIONER;NOT SALOME_USE_MPI" OFF)
-CMAKE_DEPENDENT_OPTION(SALOME_MED_PARTITIONER_SCOTCH "Enable scotch graph librarie in MEDPartitioner." ON "SALOME_MED_ENABLE_PARTITIONER;NOT SALOME_USE_MPI" OFF)
-CMAKE_DEPENDENT_OPTION(SALOME_MED_PARTITIONER_PARMETIS "Enable parmetis graph librarie in MEDPartitioner." ON "SALOME_MED_ENABLE_PARTITIONER;SALOME_USE_MPI" OFF)
+CMAKE_DEPENDENT_OPTION(SALOME_MED_PARTITIONER_METIS "Enable metis graph library in MEDPartitioner." ON "SALOME_MED_ENABLE_PARTITIONER;NOT SALOME_USE_MPI" OFF)
+CMAKE_DEPENDENT_OPTION(SALOME_MED_PARTITIONER_SCOTCH "Enable scotch graph library in MEDPartitioner." ON "SALOME_MED_ENABLE_PARTITIONER;NOT SALOME_USE_MPI" OFF)
+CMAKE_DEPENDENT_OPTION(SALOME_MED_PARTITIONER_PARMETIS "Enable parmetis graph library in MEDPartitioner." ON "SALOME_MED_ENABLE_PARTITIONER;SALOME_USE_MPI" OFF)
 
 #
 # Set list of prerequisites

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 8d3abc7cca82e712aad252dc8386f6c7040beb61..e8c8dee1966c59ef5ca1429ffdc52334d70f3073 100644 (file)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -22,7 +22,6 @@ INCLUDE(UseOmniORB)
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 

diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx
index b048a65af1275f18749059a57e8a674fb1aa9397..01fc3125b87a4376e9e05da6d359042aaa5cab91 100644 (file)
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx
@@ -44,7 +44,8 @@ namespace INTERP_KERNEL
   class Bounds;
   
   /*!
-   * As nodes can be shared between edges it is dealed with ref counting.
+   * Representation of a 2D point, and potentially its location relative to a polygon.
+   * As nodes can be shared between edges it is handled with ref counting.
    */
   class INTERPKERNEL_EXPORT Node
   {

diff --git a/src/MEDCalculator/CMakeLists.txt b/src/MEDCalculator/CMakeLists.txt
index 0417d5c4f451ef6f7e071b61735876f364712ba2..958982e4513c6101d717314d44f90e09a83b1297 100644 (file)
--- a/src/MEDCalculator/CMakeLists.txt
+++ b/src/MEDCalculator/CMakeLists.txt
@@ -33,7 +33,6 @@ INCLUDE_DIRECTORIES(
   ${HDF5_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
-  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCouplingCorba
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDLoader

diff --git a/src/MEDCoupling/MEDCouplingUMesh.cxx b/src/MEDCoupling/MEDCouplingUMesh.cxx
index bd2f9b5dc8d71f86b280c3c23e85254012d6519e..8a76f4b780081209a8509b04b32e3ce8304e2969 100644 (file)
--- a/src/MEDCoupling/MEDCouplingUMesh.cxx
+++ b/src/MEDCoupling/MEDCouplingUMesh.cxx
@@ -8226,7 +8226,7 @@ MEDCouplingUMesh *MEDCouplingUMesh::Intersect2DMeshes(const MEDCouplingUMesh *m1
   MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> dd5(m1Desc),dd6(m2Desc);
   std::vector< std::vector<int> > intersectEdge2;
   BuildIntersectEdges(m1Desc,m2Desc,addCoo,subDiv2,intersectEdge2);
-  subDiv2.clear(); dd5=0; dd6=0;
+  subDiv2.clear(); //dd5=0; dd6=0;
   std::vector<int> cr,crI; //no DataArrayInt because interface with Geometric2D
   std::vector<int> cNb1,cNb2; //no DataArrayInt because interface with Geometric2D
   BuildIntersecting2DCellsFromEdges(eps,m1,desc1->getConstPointer(),descIndx1->getConstPointer(),intersectEdge1,colinear2,m2,desc2->getConstPointer(),descIndx2->getConstPointer(),intersectEdge2,addCoo,

diff --git a/src/MEDCouplingCorba/CMakeLists.txt b/src/MEDCouplingCorba/CMakeLists.txt
index 1b1e252624153486e1b6d35daa677ced6d3532e7..57f427971e8b740414ef67733dfaf09cdf78d132 100644 (file)
--- a/src/MEDCouplingCorba/CMakeLists.txt
+++ b/src/MEDCouplingCorba/CMakeLists.txt
@@ -28,7 +28,6 @@ ENDIF(SALOME_BUILD_TESTS)
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL

diff --git a/src/MEDCouplingCorba/Client/CMakeLists.txt b/src/MEDCouplingCorba/Client/CMakeLists.txt
index 90fb582103d41817b1498af9dca42cd1b96d3c26..260c49e3262856d5f7599196922aaaf275695567 100644 (file)
--- a/src/MEDCouplingCorba/Client/CMakeLists.txt
+++ b/src/MEDCouplingCorba/Client/CMakeLists.txt
@@ -20,7 +20,6 @@
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling
   ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL

diff --git a/src/MEDCouplingCorba/Test/CMakeLists.txt b/src/MEDCouplingCorba/Test/CMakeLists.txt
index 48bb20dd8950b41bf9f929b3da2a0bfee5fb7261..940e7d83c5693668c5afcdb66d665dff28507422 100644 (file)
--- a/src/MEDCouplingCorba/Test/CMakeLists.txt
+++ b/src/MEDCouplingCorba/Test/CMakeLists.txt
@@ -22,7 +22,6 @@ INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${CPPUNIT_INCLUDE_DIRS}
-  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${CMAKE_CURRENT_SOURCE_DIR}/../Client

diff --git a/src/MEDCouplingCorba_Swig/CMakeLists.txt b/src/MEDCouplingCorba_Swig/CMakeLists.txt
index 0fd808c199fad8af1b18d1252d1699e1ec74e221..bd523c13d4a65246ebcc49046216c6d0c2f878a2 100644 (file)
--- a/src/MEDCouplingCorba_Swig/CMakeLists.txt
+++ b/src/MEDCouplingCorba_Swig/CMakeLists.txt
@@ -37,7 +37,6 @@ SET(MEDCouplingCorba_SWIG_DPYS_FILES
 INCLUDE_DIRECTORIES(
   ${PYTHON_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCouplingCorba

diff --git a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
index 1de621b6a19e7c82230eb0bcbc1fc71dc0731127..03a46a352a4f688b12fe91a503f669d0cd5ade3b 100644 (file)
--- a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
+++ b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
@@ -32,7 +32,6 @@ ENDIF(NUMPY_FOUND)
 INCLUDE_DIRECTORIES(
   ${PYTHON_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCouplingCorba/Client

diff --git a/src/MEDGUI/CMakeLists.txt b/src/MEDGUI/CMakeLists.txt
index d149e702fa26ebd39b722b79d4c8e57b403a6948..7bd029b9206d96e357c059dbeca8f964690ef5fc 100644 (file)
--- a/src/MEDGUI/CMakeLists.txt
+++ b/src/MEDGUI/CMakeLists.txt
@@ -42,7 +42,6 @@ INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIRS}
-  ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl

diff --git a/src/MEDOP/cmp/CMakeLists.txt b/src/MEDOP/cmp/CMakeLists.txt
index 82f1dcc6964849c361dfe7c8549ce5b9b8fcd791..29a75a27984efed788b0479949e42190c594d666 100644 (file)
--- a/src/MEDOP/cmp/CMakeLists.txt
+++ b/src/MEDOP/cmp/CMakeLists.txt
@@ -24,7 +24,6 @@ INCLUDE_DIRECTORIES(
   ${MEDFILE_INCLUDE_DIRS}
   ${HDF5_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
-  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${PROJECT_BINARY_DIR}/idl
   ${PROJECT_SOURCE_DIR}/src/MEDCoupling

diff --git a/src/MEDOP/gui/CMakeLists.txt b/src/MEDOP/gui/CMakeLists.txt
index 534be68b09fa4c38c02fdd97ef5c995a174c5f66..7fc2540d4d78e09df1a2216efce80851a71e0b28 100644 (file)
--- a/src/MEDOP/gui/CMakeLists.txt
+++ b/src/MEDOP/gui/CMakeLists.txt
@@ -45,7 +45,6 @@ INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
-  ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/dialogs

diff --git a/src/MEDOP/gui/dialogs/CMakeLists.txt b/src/MEDOP/gui/dialogs/CMakeLists.txt
index f30ace7992a0191b015e9871c164497b02d8e6a5..3cf171b8037f49f58f0cee73d44077198227cab2 100644 (file)
--- a/src/MEDOP/gui/dialogs/CMakeLists.txt
+++ b/src/MEDOP/gui/dialogs/CMakeLists.txt
@@ -59,7 +59,6 @@ INCLUDE_DIRECTORIES(
   ${Boost_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${QT4_INCLUDE_DIRECTORY}

diff --git a/src/ParaMEDCouplingCorba/CMakeLists.txt b/src/ParaMEDCouplingCorba/CMakeLists.txt
index 3221c59b9d91eadb7e5d3704053e015e82d62d38..af0e04ee191a451705641a345d654fb8d4de9979 100644 (file)
--- a/src/ParaMEDCouplingCorba/CMakeLists.txt
+++ b/src/ParaMEDCouplingCorba/CMakeLists.txt
@@ -20,7 +20,6 @@
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
   ${MPI_INCLUDE_DIRS}
-  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCouplingCorba
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling

diff --git a/src/ParaMEDMEMComponent/CMakeLists.txt b/src/ParaMEDMEMComponent/CMakeLists.txt
index 1caba462eba0ecc7bfcec7ea4885ca94246d60d4..d58eb876927060b4257700d4a11eda7b6b6dab0d 100644 (file)
--- a/src/ParaMEDMEMComponent/CMakeLists.txt
+++ b/src/ParaMEDMEMComponent/CMakeLists.txt
@@ -22,7 +22,6 @@ ADD_DEFINITIONS(${MPI_DEFINITIONS} ${OMNIORB_DEFINITIONS})
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
   ${MPI_INCLUDE_DIRS}
-  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../ParaMEDMEM
   ${CMAKE_CURRENT_SOURCE_DIR}/../ParaMEDCouplingCorba