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

[V84] Fix conflict netgen / netgen contrib in GMSH

Browse Source
This commit is contained in:
Nicolas 2017-10-12 16:02:58 +02:00 committed by vsr
parent f5f73b5e03
commit f4da288f5a
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -77,6 +77,11 @@ OPTION(SALOME_BUILD_DOC "Generate SALOME SMESH documentation" ON)
OPTION(SALOME_BUILD_GUI "Enable GUI" ON) OPTION(SALOME_BUILD_GUI "Enable GUI" ON)
OPTION(SALOME_SMESH_USE_CGNS "Enable import/export to CGNS format" OFF) OPTION(SALOME_SMESH_USE_CGNS "Enable import/export to CGNS format" OFF)
OPTION(SALOME_SMESH_USE_TBB "Enable parallel computation" OFF) OPTION(SALOME_SMESH_USE_TBB "Enable parallel computation" OFF)
OPTION(SALOME_SMESH_DYNLOAD_LOCAL "Load plug-ins' symbols locally (Linux only)" OFF)
IF(SALOME_SMESH_DYNLOAD_LOCAL)
ADD_DEFINITIONS(-DDYNLOAD_LOCAL)
ENDIF(SALOME_SMESH_DYNLOAD_LOCAL)
#On Linux use Fortran to compile MEFISTO2D #On Linux use Fortran to compile MEFISTO2D
IF(NOT WIN32) IF(NOT WIN32)
@ -85,7 +90,7 @@ IF(NOT WIN32)
ADD_DEFINITIONS(-DENABLE_MEFISTO) ADD_DEFINITIONS(-DENABLE_MEFISTO)
ENDIF(NOT WIN32) ENDIF(NOT WIN32)
MARK_AS_ADVANCED(SALOME_BUILD_GUI SALOME_SMESH_USE_CGNS SALOME_SMESH_USE_TBB) MARK_AS_ADVANCED(SALOME_BUILD_GUI SALOME_SMESH_USE_CGNS SALOME_SMESH_USE_TBB SALOME_SMESH_DYNLOAD_LOCAL)
# Prerequisites # Prerequisites
# ============= # =============

24
src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
View File

@ -63,16 +63,20 @@
#endif #endif
#ifdef WIN32 #ifdef WIN32
#define LibHandle HMODULE #define LibHandle HMODULE
#define LoadLib( name ) LoadLibrary( name ) #define LoadLib( name ) LoadLibrary( name )
#define GetProc GetProcAddress #define GetProc GetProcAddress
#define UnLoadLib( handle ) FreeLibrary( handle ); #define UnLoadLib( handle ) FreeLibrary( handle );
#else #else // WIN32
#define LibHandle void* #define LibHandle void*
#define LoadLib( name ) dlopen( name, RTLD_LAZY | RTLD_GLOBAL ) #ifdef DYNLOAD_LOCAL
#define GetProc dlsym #define LoadLib( name ) dlopen( name, RTLD_LAZY | RTLD_LOCAL )
#define UnLoadLib( handle ) dlclose( handle ); #else // DYNLOAD_LOCAL
#endif #define LoadLib( name ) dlopen( name, RTLD_LAZY | RTLD_GLOBAL )
#endif // DYNLOAD_LOCAL
#define GetProc dlsym
#define UnLoadLib( handle ) dlclose( handle );
#endif // WIN32
#ifdef _DEBUG_ #ifdef _DEBUG_
static int MYDEBUG = 0; static int MYDEBUG = 0;

10
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -62,12 +62,16 @@
#define LoadLib( name ) LoadLibrary( name ) #define LoadLib( name ) LoadLibrary( name )
#define GetProc GetProcAddress #define GetProc GetProcAddress
#define UnLoadLib( handle ) FreeLibrary( handle ); #define UnLoadLib( handle ) FreeLibrary( handle );
#else #else // WIN32
#define LibHandle void* #define LibHandle void*
#define LoadLib( name ) dlopen( name, RTLD_LAZY | RTLD_GLOBAL ) #ifdef DYNLOAD_LOCAL
#define LoadLib( name ) dlopen( name, RTLD_LAZY | RTLD_LOCAL )
#else // DYNLOAD_LOCAL
#define LoadLib( name ) dlopen( name, RTLD_LAZY | RTLD_GLOBAL )
#endif // DYNLOAD_LOCAL
#define GetProc dlsym #define GetProc dlsym
#define UnLoadLib( handle ) dlclose( handle ); #define UnLoadLib( handle ) dlclose( handle );
#endif #endif // WIN32
#include "SMESH_Gen_i.hxx" #include "SMESH_Gen_i.hxx"
#include "SMESH_version.h" #include "SMESH_version.h"