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

Create and use HAVE_NETGEN (#define) to avoid unresolved symbols in libraries.

Browse Source
This commit is contained in:
jrt 2003-12-10 17:23:08 +00:00
parent aadf713b66
commit bf1947495c
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
adm_local/unix/config_files/check_Netgen.m4
View File

@ -9,7 +9,7 @@ AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_ARG_WITH(netgen, AC_ARG_WITH(netgen,
--with-netgen=DIR root directory path of NETGEN installation, [ --with-netgen=DIR root directory path of NETGEN installation],
WITHNETGEN="yes",WITHNETGEN="no") WITHNETGEN="yes",WITHNETGEN="no")
NETGEN_INCLUDES="" NETGEN_INCLUDES=""
@ -111,6 +111,7 @@ if test "x$Netgen_ok" = xno ; then
else else
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
NETGEN_LIBS="-lNETGEN" NETGEN_LIBS="-lNETGEN"
CPPFLAGS="${CPPFLAGS} -DHAVE_NETGEN"
fi fi
fi fi
AC_SUBST(NETGEN_INCLUDES) AC_SUBST(NETGEN_INCLUDES)

3
idl/SMESH_BasicHypothesis.idl
View File

@ -86,9 +86,12 @@ module SMESH
{ {
}; };
#ifdef HAVE_NETGEN
interface SMESH_NETGEN_3D : SMESH_3D_Algo interface SMESH_NETGEN_3D : SMESH_3D_Algo
{ {
}; };
#endif
}; };
#endif #endif

7
src/SMESH_I/SMESH_HypothesisFactory_i.cxx
View File

@ -26,7 +26,6 @@
// Module : SMESH // Module : SMESH
// $Header$ // $Header$
using namespace std;
using namespace std; using namespace std;
#include "SMESH_HypothesisFactory_i.hxx" #include "SMESH_HypothesisFactory_i.hxx"
#include "SMESH_Hypothesis_i.hxx" #include "SMESH_Hypothesis_i.hxx"
@ -45,8 +44,9 @@ using namespace std;
#include "SMESH_MEFISTO_2D_i.hxx" #include "SMESH_MEFISTO_2D_i.hxx"
#include "SMESH_Quadrangle_2D_i.hxx" #include "SMESH_Quadrangle_2D_i.hxx"
#include "SMESH_Hexa_3D_i.hxx" #include "SMESH_Hexa_3D_i.hxx"
#ifdef HAVE_NETGEN
#include "SMESH_NETGEN_3D_i.hxx" #include "SMESH_NETGEN_3D_i.hxx"
#endif
//--------------------------------------- //---------------------------------------
//============================================================================= //=============================================================================
@ -92,8 +92,9 @@ _creatorMap["Regular_1D"] = new HypothesisCreator_i<SMESH_Regular_1D_i>;
_creatorMap["MEFISTO_2D"] = new HypothesisCreator_i<SMESH_MEFISTO_2D_i>; _creatorMap["MEFISTO_2D"] = new HypothesisCreator_i<SMESH_MEFISTO_2D_i>;
_creatorMap["Quadrangle_2D"] = new HypothesisCreator_i<SMESH_Quadrangle_2D_i>; _creatorMap["Quadrangle_2D"] = new HypothesisCreator_i<SMESH_Quadrangle_2D_i>;
_creatorMap["Hexa_3D"] = new HypothesisCreator_i<SMESH_Hexa_3D_i>; _creatorMap["Hexa_3D"] = new HypothesisCreator_i<SMESH_Hexa_3D_i>;
#ifdef HAVE_NETGEN
_creatorMap["NETGEN_3D"] = new HypothesisCreator_i<SMESH_NETGEN_3D_i>; _creatorMap["NETGEN_3D"] = new HypothesisCreator_i<SMESH_NETGEN_3D_i>;
#endif
//--------------------------------------- //---------------------------------------
} }