From 506b60a6d82c3dc5a205ddbef30c66529f1519e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernard=20S=C3=A9cher?= Date: Mon, 9 Feb 2015 11:07:54 +0100 Subject: [PATCH] changes for mpi compilation --- CMakeLists.txt | 3 --- src/MEDWrapper/Factory/MED_Factory.cxx | 2 +- src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx | 3 --- src/Tools/MeshCut/MeshCut_Utils.hxx | 3 --- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 15d1c70c6..7470957cd 100755 --- 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 06ebdd00f..853b37f7c 100644 --- a/src/MEDWrapper/Factory/MED_Factory.cxx +++ b/src/MEDWrapper/Factory/MED_Factory.cxx @@ -27,9 +27,9 @@ #include #include +#include extern "C" { -#include #ifndef WIN32 #include #endif diff --git a/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx b/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx index 1b097b9b1..722223204 100644 --- 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 #include -} #ifdef _DEBUG_ static int MYDEBUG = 0; diff --git a/src/Tools/MeshCut/MeshCut_Utils.hxx b/src/Tools/MeshCut/MeshCut_Utils.hxx index 63658e5a8..ee26efbb7 100644 --- 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 - } #include #include