changes for mpi compilation

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15d1c70c6d493583595f0d2b1a32aafc710aea45..7470957cd8e7430b2008a07ebdc8707ab939c29c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,9 +101,6 @@ FIND_PACKAGE(SalomeLibXml2 REQUIRED)
 FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C)
 
 # Other KERNEL optionals:
-IF(SALOME_USE_MPI)
-  FIND_PACKAGE(SalomeMPI) # needed for doc generation by Sphinx
-ENDIF()
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
   FIND_PACKAGE(SalomeCppUnit)

diff --git a/src/MEDWrapper/Factory/MED_Factory.cxx b/src/MEDWrapper/Factory/MED_Factory.cxx
index 06ebdd00fe22e0cd5c385c2cec8a79cf25ce5a14..853b37f7c7e327665e1419f03fb246f5a1862560 100644 (file)
--- a/src/MEDWrapper/Factory/MED_Factory.cxx
+++ b/src/MEDWrapper/Factory/MED_Factory.cxx
@@ -27,9 +27,9 @@
 #include <stdio.h>
 #include <sstream>
 
+#include <med.h>
 extern "C"
 {
-#include <med.h>
 #ifndef WIN32
   #include <unistd.h>
 #endif

diff --git a/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx b/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx
index 1b097b9b19c4a5967ebcc762c0fff55e2bcd284f..7222232044f7141f99f79907c79d7c8302c37696 100644 (file)
--- a/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx
+++ b/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx
@@ -24,11 +24,8 @@
 #include "MED_Algorithm.hxx"
 #include "MED_Utilities.hxx"
 
-extern "C"
-{
 #include <med.h>
 #include <med_err.h>
-}
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;

diff --git a/src/Tools/MeshCut/MeshCut_Utils.hxx b/src/Tools/MeshCut/MeshCut_Utils.hxx
index 63658e5a8409fe5cad1d9b7280b2c3fe44cd5b4e..ee26efbb7ad624527b9f6af75febf1de569dfaaf 100644 (file)
--- a/src/Tools/MeshCut/MeshCut_Utils.hxx
+++ b/src/Tools/MeshCut/MeshCut_Utils.hxx
@@ -20,10 +20,7 @@
 #ifndef __MESHCUT_UTILS_HXX__
 #define __MESHCUT_UTILS_HXX__
 
-extern "C"
-  {
 #include <med.h>
-  }
 
 #include <string>
 #include <vector>