ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from V6_main 06/03/2013

Browse Source
This commit is contained in:
vsr 2013-03-06 13:59:46 +00:00
parent 7fb1d4d449
commit a7ea391a07
1 changed files with 98 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
adm_local/unix/config_files/check_NETGEN.m4
View File

@ -77,7 +77,8 @@ if test "x$NETGEN_HOME" != "x"; then
echo ---------------------------------------------------------- echo ----------------------------------------------------------
NETGEN_INCLUDES="-I${NETGEN_HOME}/include -I${NETGEN_HOME}/share/netgen/include" NETGEN_INCLUDES="-I${NETGEN_HOME}/include -I${NETGEN_HOME}/share/netgen/include"
NETGEN_LIBS="-L${NETGEN_HOME}/lib -lnglib" NETGEN_LIBS_OLD="-L${NETGEN_HOME}/lib -lnglib"
NETGEN_LIBS_NEW="-L${NETGEN_HOME}/lib -lnglib -linterface -lgeom2d -lcsg -lstl -locc -lmesh"
dnl check Netgen headers availability dnl check Netgen headers availability
@ -92,15 +93,18 @@ if test "x$NETGEN_HOME" != "x"; then
dnl check Netgen libraries dnl check Netgen libraries
NETGEN_LIBS=${NETGEN_LIBS_NEW}
LIBS_old="$LIBS" LIBS_old="$LIBS"
LIBS="$NETGEN_LIBS $CAS_LDPATH -lTKernel -lTKMath -lTKG3d -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKSTL -lTKTopAlgo -lTKGeomBase $LIBS" LIBS="$NETGEN_LIBS $CAS_LDPATH -lTKernel -lTKMath -lTKG3d -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKSTL -lTKTopAlgo -lTKGeomBase $LIBS_old"
if test "x$Netgen_ok" = "xyes"; then if test "x$Netgen_ok" = "xyes"; then
AC_MSG_CHECKING([for Netgen libraries]) AC_MSG_NOTICE([checking for Netgen libraries])
AC_CACHE_VAL([salome_cv_netgen_lib], AC_MSG_CHECKING([libraries ... try new style ])
[AC_TRY_LINK(
AC_TRY_LINK(
[ [
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
@ -112,11 +116,34 @@ if test "x$NETGEN_HOME" != "x"; then
nglib::Ng_Init(); nglib::Ng_Init();
nglib::Ng_Exit(); nglib::Ng_Exit();
], ],
[eval "salome_cv_netgen_lib=yes"], [Netgen_ok=yes],
[eval "salome_cv_netgen_lib=no"]) [Netgen_ok=no])
])
Netgen_ok="$salome_cv_netgen_lib" if test "x$Netgen_ok" = "xno" ; then
AC_MSG_RESULT([no])
AC_MSG_CHECKING([libraries ... try old style])
NETGEN_LIBS=${NETGEN_LIBS_OLD}
LIBS="$NETGEN_LIBS $CAS_LDPATH -lTKernel -lTKMath -lTKG3d -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKSTL -lTKTopAlgo -lTKGeomBase $LIBS_old"
AC_TRY_LINK(
[
#include <iostream>
#include <fstream>
namespace nglib {
#include "nglib.h"
}
],
[
nglib::Ng_Init();
nglib::Ng_Exit();
],
[Netgen_ok=yes],
[Netgen_ok=no])
fi
fi fi
@ -128,8 +155,7 @@ if test "x$NETGEN_HOME" != "x"; then
AC_MSG_CHECKING([Netgen version]) AC_MSG_CHECKING([Netgen version])
AC_CACHE_VAL([salome_cv_netgen_v5_lib], AC_TRY_LINK(
[AC_TRY_LINK(
[ [
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
@ -145,13 +171,9 @@ if test "x$NETGEN_HOME" != "x"; then
ngMesh->CalcLocalH(1.0); ngMesh->CalcLocalH(1.0);
nglib::Ng_Exit(); nglib::Ng_Exit();
], ],
[eval "salome_cv_netgen_v5_lib=yes"], [NETGEN_V5=yes],
[eval "salome_cv_netgen_v5_lib=no"]) [NETGEN_V5=no])
])
if test "x$salome_cv_netgen_v5_lib" = "xyes" ; then
NETGEN_V5=yes
fi
fi fi
dnl check OCCT support in Netgen dnl check OCCT support in Netgen
@ -162,8 +184,7 @@ if test "x$NETGEN_HOME" != "x"; then
AC_MSG_CHECKING([for OCCT support in Netgen library]) AC_MSG_CHECKING([for OCCT support in Netgen library])
AC_CACHE_VAL([salome_cv_netgen_occ_lib], AC_TRY_LINK(
[AC_TRY_LINK(
[ [
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
@ -177,11 +198,8 @@ if test "x$NETGEN_HOME" != "x"; then
nglib::Ng_OCC_Geometry* ng_occ_geom = nglib::Ng_OCC_NewGeometry(); nglib::Ng_OCC_Geometry* ng_occ_geom = nglib::Ng_OCC_NewGeometry();
nglib::Ng_Exit(); nglib::Ng_Exit();
], ],
[eval "salome_cv_netgen_occ_lib=yes"], [Netgen_ok=yes],
[eval "salome_cv_netgen_occ_lib=no"]) [Netgen_ok=no])
])
Netgen_ok="$salome_cv_netgen_occ_lib"
fi fi
@ -193,8 +211,7 @@ if test "x$NETGEN_HOME" != "x"; then
AC_MSG_CHECKING([for SALOME patch in Netgen library]) AC_MSG_CHECKING([for SALOME patch in Netgen library])
AC_CACHE_VAL([salome_cv_netgen_salome_patch_lib], AC_TRY_LINK(
[AC_TRY_LINK(
[ [
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
@ -209,11 +226,8 @@ if test "x$NETGEN_HOME" != "x"; then
netgen::OCCGeometry occgeo; netgen::OCCGeometry occgeo;
nglib::Ng_Exit(); nglib::Ng_Exit();
], ],
[eval "salome_cv_netgen_salome_patch_lib=yes"], [Netgen_ok=yes],
[eval "salome_cv_netgen_salome_patch_lib=no"]) [Netgen_ok=no])
])
Netgen_ok="$salome_cv_netgen_salome_patch_lib"
fi fi