ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-28 10:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/bsr/medmpi'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -101,9 +101,6 @@ FIND_PACKAGE(SalomeLibXml2 REQUIRED)
FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C) FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C)
# Other KERNEL optionals: # Other KERNEL optionals:
IF(SALOME_USE_MPI)
FIND_PACKAGE(SalomeMPI) # needed for doc generation by Sphinx
ENDIF()
IF(SALOME_BUILD_TESTS) IF(SALOME_BUILD_TESTS)
ENABLE_TESTING() ENABLE_TESTING()
FIND_PACKAGE(SalomeCppUnit) FIND_PACKAGE(SalomeCppUnit)

2
src/MEDWrapper/Factory/MED_Factory.cxx
View File

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

3
src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx
View File

@ -24,11 +24,8 @@
#include "MED_Algorithm.hxx" #include "MED_Algorithm.hxx"
#include "MED_Utilities.hxx" #include "MED_Utilities.hxx"
extern "C"
{
#include <med.h> #include <med.h>
#include <med_err.h> #include <med_err.h>
}
#ifdef _DEBUG_ #ifdef _DEBUG_
static int MYDEBUG = 0; static int MYDEBUG = 0;

3
src/Tools/MeshCut/MeshCut_Utils.hxx
View File

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