From 16d8ff28e36aa293b12f66f0f629266e6c191f13 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernard=20S=C3=A9cher?= Date: Mon, 9 Feb 2015 11:17:46 +0100 Subject: [PATCH] changes for mpi compilation --- .gitignore | 1 + CMakeLists.txt | 3 --- src/HOMARDGUI/HomardQtCommun.cxx | 5 +---- src/HOMARD_I/HomardMedCommun.cxx | 3 --- 4 files changed, 2 insertions(+), 10 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b25c15b8 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*~ diff --git a/CMakeLists.txt b/CMakeLists.txt index 231ea29b..a0fb7dd9 100755 --- 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 2dec6c10..8e3364e3 100644 --- a/src/HOMARDGUI/HomardQtCommun.cxx +++ b/src/HOMARDGUI/HomardQtCommun.cxx @@ -36,11 +36,8 @@ #include "SalomeApp_Tools.h" using namespace std; -extern "C" -{ -#include -} +#include // ============================================================================ QString HOMARD_QT_COMMUN::SelectionArbreEtude(QString commentaire, int option ) diff --git a/src/HOMARD_I/HomardMedCommun.cxx b/src/HOMARD_I/HomardMedCommun.cxx index e37ddffd..bf18224f 100644 --- a/src/HOMARD_I/HomardMedCommun.cxx +++ b/src/HOMARD_I/HomardMedCommun.cxx @@ -25,10 +25,7 @@ #include #include -extern "C" -{ #include -} #include "utilities.h" // ======================================================================= -- 2.39.2