Merge remote branch 'origin/bsr/medmpi'

This commit is contained in:
vsr 2015-02-10 18:54:31 +03:00
commit 513a8ebdac
4 changed files with 1 additions and 10 deletions

View File

@ -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)

View File

@ -27,9 +27,9 @@
#include <stdio.h>
#include <sstream>
#include <med.h>
extern "C"
{
#include <med.h>
#ifndef WIN32
#include <unistd.h>
#endif

View File

@ -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;

View File

@ -20,10 +20,7 @@
#ifndef __MESHCUT_UTILS_HXX__
#define __MESHCUT_UTILS_HXX__
extern "C"
{
#include <med.h>
}
#include <string>
#include <vector>