mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-27 09:50:34 +05:00
Merge remote branch 'origin/bsr/medmpi'
This commit is contained in:
commit
513a8ebdac
@ -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)
|
||||
|
@ -27,9 +27,9 @@
|
||||
#include <stdio.h>
|
||||
#include <sstream>
|
||||
|
||||
#include <med.h>
|
||||
extern "C"
|
||||
{
|
||||
#include <med.h>
|
||||
#ifndef WIN32
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
@ -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;
|
||||
|
@ -20,10 +20,7 @@
|
||||
#ifndef __MESHCUT_UTILS_HXX__
|
||||
#define __MESHCUT_UTILS_HXX__
|
||||
|
||||
extern "C"
|
||||
{
|
||||
#include <med.h>
|
||||
}
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
Loading…
Reference in New Issue
Block a user