Merge remote branch 'origin/bsr/medmpi'

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..b25c15b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9df1608da64ac642eb866a411573a666e3ef14c5..d02980ed787635944519b3f69c72c1dc96ab101a 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,9 +78,6 @@ FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
 FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C)
 
 # Other KERNEL optionals:
-IF(SALOME_USE_MPI)
-  FIND_PACKAGE(SalomeMPI REQUIRED) # needed for doc generation by Sphinx
-ENDIF()
 IF(SALOME_BUILD_DOC)
   FIND_PACKAGE(SalomeSphinx)
   SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)

diff --git a/src/HOMARDGUI/HomardQtCommun.cxx b/src/HOMARDGUI/HomardQtCommun.cxx
index 8145a09a8677322db944de2d59b6bdb895603c23..1cb665ef6801d53c35341642c9f3e4b67e0c3c5a 100644 (file)
--- a/src/HOMARDGUI/HomardQtCommun.cxx
+++ b/src/HOMARDGUI/HomardQtCommun.cxx
@@ -36,11 +36,8 @@
 #include "SalomeApp_Tools.h"
 
 using namespace std;
-extern "C"
-{
-#include <med.h>
-}
 
+#include <med.h>
 
 // ============================================================================
 QString HOMARD_QT_COMMUN::SelectionArbreEtude(QString commentaire, int option )

diff --git a/src/HOMARD_I/HomardMedCommun.cxx b/src/HOMARD_I/HomardMedCommun.cxx
index a1c4ea9fe87e682bd685c6db22e89164b7dff222..6f157bc224f21c410236a3bdb4d3f20ca9ee676e 100644 (file)
--- a/src/HOMARD_I/HomardMedCommun.cxx
+++ b/src/HOMARD_I/HomardMedCommun.cxx
@@ -25,10 +25,7 @@
 #include <cstring>
 #include <algorithm>
 
-extern "C"
-{
 #include <med.h>
-}
 
 #include "utilities.h"
 // =======================================================================