mirror of
https://github.com/NGSolve/netgen.git
synced 2024-12-24 04:50:34 +05:00
opencascade support
This commit is contained in:
Joachim Schoeberl
parent
f4a8c49f6c
commit
3d10410665
@ -119,6 +119,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
548
configure
vendored
548
configure
vendored
@ -785,6 +785,8 @@ ac_includes_default="\
|
||||
|
||||
ac_subst_vars='LTLIBOBJS
|
||||
LIBOBJS
|
||||
OCCLIBS
|
||||
OCCFLAGS
|
||||
OCC_FALSE
|
||||
OCC_TRUE
|
||||
CXXCPP
|
||||
@ -838,7 +840,6 @@ CPPFLAGS
|
||||
LDFLAGS
|
||||
CXXFLAGS
|
||||
CXX
|
||||
OCCFLAGS
|
||||
am__untar
|
||||
am__tar
|
||||
AMTAR
|
||||
@ -2521,20 +2522,19 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-occ was given.
|
||||
if test "${enable_occ+set}" = set; then
|
||||
enableval=$enable_occ; occon=true, occfl=-DOCC
|
||||
enableval=$enable_occ; occon=true occfl='-DOCCGEOMETRY -I/usr/local/inc'
|
||||
occlfl='-lTKIGES -lTKBRep -lTKSTEP -lTKSTL'
|
||||
else
|
||||
occon=false
|
||||
fi
|
||||
|
||||
|
||||
OCCFLAGS=$occfl
|
||||
|
||||
|
||||
ac_config_headers="$ac_config_headers config.h"
|
||||
|
||||
# AM_INIT_AUTOMAKE(netgen, 4.9.2)
|
||||
|
||||
ac_ext=cpp
|
||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
@ -15170,9 +15170,546 @@ else
|
||||
OCC_FALSE=
|
||||
fi
|
||||
|
||||
OCCFLAGS=$occfl
|
||||
|
||||
OCCLIBS=$occlfl
|
||||
|
||||
|
||||
|
||||
if test "${ac_cv_header_iostream+set}" = set; then
|
||||
{ $as_echo "$as_me:$LINENO: checking for iostream" >&5
|
||||
$as_echo_n "checking for iostream... " >&6; }
|
||||
if test "${ac_cv_header_iostream+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_iostream" >&5
|
||||
$as_echo "$ac_cv_header_iostream" >&6; }
|
||||
else
|
||||
# Is the header compilable?
|
||||
{ $as_echo "$as_me:$LINENO: checking iostream usability" >&5
|
||||
$as_echo_n "checking iostream usability... " >&6; }
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
#include <iostream>
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo") >&5
|
||||
(eval "$ac_compile") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_cxx_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then
|
||||
ac_header_compiler=yes
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_header_compiler=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||||
$as_echo "$ac_header_compiler" >&6; }
|
||||
|
||||
# Is the header present?
|
||||
{ $as_echo "$as_me:$LINENO: checking iostream presence" >&5
|
||||
$as_echo_n "checking iostream presence... " >&6; }
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <iostream>
|
||||
_ACEOF
|
||||
if { (ac_try="$ac_cpp conftest.$ac_ext"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo") >&5
|
||||
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } >/dev/null && {
|
||||
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
}; then
|
||||
ac_header_preproc=yes
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_header_preproc=no
|
||||
fi
|
||||
|
||||
rm -f conftest.err conftest.$ac_ext
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||||
$as_echo "$ac_header_preproc" >&6; }
|
||||
|
||||
# So? What about this header?
|
||||
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
|
||||
yes:no: )
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: iostream: accepted by the compiler, rejected by the preprocessor!" >&5
|
||||
$as_echo "$as_me: WARNING: iostream: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: iostream: proceeding with the compiler's result" >&5
|
||||
$as_echo "$as_me: WARNING: iostream: proceeding with the compiler's result" >&2;}
|
||||
ac_header_preproc=yes
|
||||
;;
|
||||
no:yes:* )
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: iostream: present but cannot be compiled" >&5
|
||||
$as_echo "$as_me: WARNING: iostream: present but cannot be compiled" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: iostream: check for missing prerequisite headers?" >&5
|
||||
$as_echo "$as_me: WARNING: iostream: check for missing prerequisite headers?" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: iostream: see the Autoconf documentation" >&5
|
||||
$as_echo "$as_me: WARNING: iostream: see the Autoconf documentation" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: iostream: section \"Present But Cannot Be Compiled\"" >&5
|
||||
$as_echo "$as_me: WARNING: iostream: section \"Present But Cannot Be Compiled\"" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: iostream: proceeding with the preprocessor's result" >&5
|
||||
$as_echo "$as_me: WARNING: iostream: proceeding with the preprocessor's result" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: iostream: in the future, the compiler will take precedence" >&5
|
||||
$as_echo "$as_me: WARNING: iostream: in the future, the compiler will take precedence" >&2;}
|
||||
|
||||
;;
|
||||
esac
|
||||
{ $as_echo "$as_me:$LINENO: checking for iostream" >&5
|
||||
$as_echo_n "checking for iostream... " >&6; }
|
||||
if test "${ac_cv_header_iostream+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_cv_header_iostream=$ac_header_preproc
|
||||
fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_iostream" >&5
|
||||
$as_echo "$ac_cv_header_iostream" >&6; }
|
||||
|
||||
fi
|
||||
if test "x$ac_cv_header_iostream" = x""yes; then
|
||||
OCCFLAGS="$OCCFLAGS -DHAVE_IOSTREAM"
|
||||
fi
|
||||
|
||||
|
||||
if test "${ac_cv_header_iostream_h+set}" = set; then
|
||||
{ $as_echo "$as_me:$LINENO: checking for iostream.h" >&5
|
||||
$as_echo_n "checking for iostream.h... " >&6; }
|
||||
if test "${ac_cv_header_iostream_h+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_iostream_h" >&5
|
||||
$as_echo "$ac_cv_header_iostream_h" >&6; }
|
||||
else
|
||||
# Is the header compilable?
|
||||
{ $as_echo "$as_me:$LINENO: checking iostream.h usability" >&5
|
||||
$as_echo_n "checking iostream.h usability... " >&6; }
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
#include <iostream.h>
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo") >&5
|
||||
(eval "$ac_compile") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_cxx_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then
|
||||
ac_header_compiler=yes
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_header_compiler=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||||
$as_echo "$ac_header_compiler" >&6; }
|
||||
|
||||
# Is the header present?
|
||||
{ $as_echo "$as_me:$LINENO: checking iostream.h presence" >&5
|
||||
$as_echo_n "checking iostream.h presence... " >&6; }
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <iostream.h>
|
||||
_ACEOF
|
||||
if { (ac_try="$ac_cpp conftest.$ac_ext"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo") >&5
|
||||
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } >/dev/null && {
|
||||
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
}; then
|
||||
ac_header_preproc=yes
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_header_preproc=no
|
||||
fi
|
||||
|
||||
rm -f conftest.err conftest.$ac_ext
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||||
$as_echo "$ac_header_preproc" >&6; }
|
||||
|
||||
# So? What about this header?
|
||||
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
|
||||
yes:no: )
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: iostream.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
||||
$as_echo "$as_me: WARNING: iostream.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: iostream.h: proceeding with the compiler's result" >&5
|
||||
$as_echo "$as_me: WARNING: iostream.h: proceeding with the compiler's result" >&2;}
|
||||
ac_header_preproc=yes
|
||||
;;
|
||||
no:yes:* )
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: iostream.h: present but cannot be compiled" >&5
|
||||
$as_echo "$as_me: WARNING: iostream.h: present but cannot be compiled" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: iostream.h: check for missing prerequisite headers?" >&5
|
||||
$as_echo "$as_me: WARNING: iostream.h: check for missing prerequisite headers?" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: iostream.h: see the Autoconf documentation" >&5
|
||||
$as_echo "$as_me: WARNING: iostream.h: see the Autoconf documentation" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: iostream.h: section \"Present But Cannot Be Compiled\"" >&5
|
||||
$as_echo "$as_me: WARNING: iostream.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: iostream.h: proceeding with the preprocessor's result" >&5
|
||||
$as_echo "$as_me: WARNING: iostream.h: proceeding with the preprocessor's result" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: iostream.h: in the future, the compiler will take precedence" >&5
|
||||
$as_echo "$as_me: WARNING: iostream.h: in the future, the compiler will take precedence" >&2;}
|
||||
|
||||
;;
|
||||
esac
|
||||
{ $as_echo "$as_me:$LINENO: checking for iostream.h" >&5
|
||||
$as_echo_n "checking for iostream.h... " >&6; }
|
||||
if test "${ac_cv_header_iostream_h+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_cv_header_iostream_h=$ac_header_preproc
|
||||
fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_iostream_h" >&5
|
||||
$as_echo "$ac_cv_header_iostream_h" >&6; }
|
||||
|
||||
fi
|
||||
if test "x$ac_cv_header_iostream_h" = x""yes; then
|
||||
OCC_FLAGS="$OCCFLAGS -DHAVE_IOSTREAM_H"
|
||||
fi
|
||||
|
||||
|
||||
if test "${ac_cv_header_limits+set}" = set; then
|
||||
{ $as_echo "$as_me:$LINENO: checking for limits" >&5
|
||||
$as_echo_n "checking for limits... " >&6; }
|
||||
if test "${ac_cv_header_limits+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_limits" >&5
|
||||
$as_echo "$ac_cv_header_limits" >&6; }
|
||||
else
|
||||
# Is the header compilable?
|
||||
{ $as_echo "$as_me:$LINENO: checking limits usability" >&5
|
||||
$as_echo_n "checking limits usability... " >&6; }
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
#include <limits>
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo") >&5
|
||||
(eval "$ac_compile") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_cxx_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then
|
||||
ac_header_compiler=yes
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_header_compiler=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||||
$as_echo "$ac_header_compiler" >&6; }
|
||||
|
||||
# Is the header present?
|
||||
{ $as_echo "$as_me:$LINENO: checking limits presence" >&5
|
||||
$as_echo_n "checking limits presence... " >&6; }
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <limits>
|
||||
_ACEOF
|
||||
if { (ac_try="$ac_cpp conftest.$ac_ext"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo") >&5
|
||||
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } >/dev/null && {
|
||||
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
}; then
|
||||
ac_header_preproc=yes
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_header_preproc=no
|
||||
fi
|
||||
|
||||
rm -f conftest.err conftest.$ac_ext
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||||
$as_echo "$ac_header_preproc" >&6; }
|
||||
|
||||
# So? What about this header?
|
||||
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
|
||||
yes:no: )
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: limits: accepted by the compiler, rejected by the preprocessor!" >&5
|
||||
$as_echo "$as_me: WARNING: limits: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: limits: proceeding with the compiler's result" >&5
|
||||
$as_echo "$as_me: WARNING: limits: proceeding with the compiler's result" >&2;}
|
||||
ac_header_preproc=yes
|
||||
;;
|
||||
no:yes:* )
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: limits: present but cannot be compiled" >&5
|
||||
$as_echo "$as_me: WARNING: limits: present but cannot be compiled" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: limits: check for missing prerequisite headers?" >&5
|
||||
$as_echo "$as_me: WARNING: limits: check for missing prerequisite headers?" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: limits: see the Autoconf documentation" >&5
|
||||
$as_echo "$as_me: WARNING: limits: see the Autoconf documentation" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: limits: section \"Present But Cannot Be Compiled\"" >&5
|
||||
$as_echo "$as_me: WARNING: limits: section \"Present But Cannot Be Compiled\"" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: limits: proceeding with the preprocessor's result" >&5
|
||||
$as_echo "$as_me: WARNING: limits: proceeding with the preprocessor's result" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: limits: in the future, the compiler will take precedence" >&5
|
||||
$as_echo "$as_me: WARNING: limits: in the future, the compiler will take precedence" >&2;}
|
||||
|
||||
;;
|
||||
esac
|
||||
{ $as_echo "$as_me:$LINENO: checking for limits" >&5
|
||||
$as_echo_n "checking for limits... " >&6; }
|
||||
if test "${ac_cv_header_limits+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_cv_header_limits=$ac_header_preproc
|
||||
fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_limits" >&5
|
||||
$as_echo "$ac_cv_header_limits" >&6; }
|
||||
|
||||
fi
|
||||
if test "x$ac_cv_header_limits" = x""yes; then
|
||||
OCCFLAGS="$OCCFLAGS -DHAVE_LIMITS"
|
||||
fi
|
||||
|
||||
|
||||
if test "${ac_cv_header_limits_h+set}" = set; then
|
||||
{ $as_echo "$as_me:$LINENO: checking for limits.h" >&5
|
||||
$as_echo_n "checking for limits.h... " >&6; }
|
||||
if test "${ac_cv_header_limits_h+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_limits_h" >&5
|
||||
$as_echo "$ac_cv_header_limits_h" >&6; }
|
||||
else
|
||||
# Is the header compilable?
|
||||
{ $as_echo "$as_me:$LINENO: checking limits.h usability" >&5
|
||||
$as_echo_n "checking limits.h usability... " >&6; }
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
#include <limits.h>
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo") >&5
|
||||
(eval "$ac_compile") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_cxx_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then
|
||||
ac_header_compiler=yes
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_header_compiler=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||||
$as_echo "$ac_header_compiler" >&6; }
|
||||
|
||||
# Is the header present?
|
||||
{ $as_echo "$as_me:$LINENO: checking limits.h presence" >&5
|
||||
$as_echo_n "checking limits.h presence... " >&6; }
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <limits.h>
|
||||
_ACEOF
|
||||
if { (ac_try="$ac_cpp conftest.$ac_ext"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo") >&5
|
||||
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } >/dev/null && {
|
||||
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
}; then
|
||||
ac_header_preproc=yes
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_header_preproc=no
|
||||
fi
|
||||
|
||||
rm -f conftest.err conftest.$ac_ext
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||||
$as_echo "$ac_header_preproc" >&6; }
|
||||
|
||||
# So? What about this header?
|
||||
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
|
||||
yes:no: )
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: limits.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
||||
$as_echo "$as_me: WARNING: limits.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: limits.h: proceeding with the compiler's result" >&5
|
||||
$as_echo "$as_me: WARNING: limits.h: proceeding with the compiler's result" >&2;}
|
||||
ac_header_preproc=yes
|
||||
;;
|
||||
no:yes:* )
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: limits.h: present but cannot be compiled" >&5
|
||||
$as_echo "$as_me: WARNING: limits.h: present but cannot be compiled" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: limits.h: check for missing prerequisite headers?" >&5
|
||||
$as_echo "$as_me: WARNING: limits.h: check for missing prerequisite headers?" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: limits.h: see the Autoconf documentation" >&5
|
||||
$as_echo "$as_me: WARNING: limits.h: see the Autoconf documentation" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: limits.h: section \"Present But Cannot Be Compiled\"" >&5
|
||||
$as_echo "$as_me: WARNING: limits.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: limits.h: proceeding with the preprocessor's result" >&5
|
||||
$as_echo "$as_me: WARNING: limits.h: proceeding with the preprocessor's result" >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: limits.h: in the future, the compiler will take precedence" >&5
|
||||
$as_echo "$as_me: WARNING: limits.h: in the future, the compiler will take precedence" >&2;}
|
||||
|
||||
;;
|
||||
esac
|
||||
{ $as_echo "$as_me:$LINENO: checking for limits.h" >&5
|
||||
$as_echo_n "checking for limits.h... " >&6; }
|
||||
if test "${ac_cv_header_limits_h+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_cv_header_limits_h=$ac_header_preproc
|
||||
fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_limits_h" >&5
|
||||
$as_echo "$ac_cv_header_limits_h" >&6; }
|
||||
|
||||
fi
|
||||
if test "x$ac_cv_header_limits_h" = x""yes; then
|
||||
OCCFLAGS="$OCCFLAGS -DHAVE_LIMITS_H"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files Makefile libsrc/Makefile libsrc/csg/Makefile libsrc/general/Makefile libsrc/geom2d/Makefile libsrc/gprim/Makefile libsrc/include/Makefile libsrc/interface/Makefile libsrc/linalg/Makefile libsrc/meshing/Makefile libsrc/occ/Makefile libsrc/opti/Makefile libsrc/parallel/Makefile libsrc/stlgeom/Makefile libsrc/visualization/Makefile ng/Makefile tutorials/Makefile"
|
||||
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
# tests run on this system so they can be shared between configure
|
||||
@ -17808,4 +18345,3 @@ fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
25
configure.ac
25
configure.ac
@ -1,13 +1,15 @@
|
||||
AC_INIT([netgen], [4.9.2], [], [])
|
||||
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
|
||||
|
||||
|
||||
AC_ARG_ENABLE([occ],
|
||||
[ --enable-occ Compile with OpenCascade geometry kernel],
|
||||
[occon=true, occfl=-DOCC],
|
||||
[occon=true occfl='-DOCCGEOMETRY -I/usr/local/inc'
|
||||
occlfl='-lTKIGES -lTKBRep -lTKSTEP -lTKSTL' ],
|
||||
[occon=false] )
|
||||
|
||||
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_HEADERS(config.h)
|
||||
|
||||
AC_LANG_CPLUSPLUS
|
||||
AC_PROG_CXX
|
||||
@ -15,13 +17,22 @@ AM_PROG_LIBTOOL
|
||||
|
||||
AM_CONDITIONAL([OCC], [test x$occon = xtrue])
|
||||
AC_SUBST([OCCFLAGS], [$occfl])
|
||||
AC_SUBST([OCCLIBS], [$occlfl])
|
||||
|
||||
AC_OUTPUT(Makefile libsrc/Makefile libsrc/csg/Makefile libsrc/general/Makefile \
|
||||
libsrc/geom2d/Makefile libsrc/gprim/Makefile libsrc/include/Makefile libsrc/interface/Makefile \
|
||||
libsrc/linalg/Makefile libsrc/meshing/Makefile libsrc/occ/Makefile libsrc/opti/Makefile \
|
||||
libsrc/parallel/Makefile libsrc/stlgeom/Makefile libsrc/visualization/Makefile ng/Makefile \
|
||||
tutorials/Makefile)
|
||||
AC_CHECK_HEADER([iostream],[OCCFLAGS="$OCCFLAGS -DHAVE_IOSTREAM"])
|
||||
AC_CHECK_HEADER([iostream.h],[OCC_FLAGS="$OCCFLAGS -DHAVE_IOSTREAM_H"])
|
||||
AC_CHECK_HEADER([limits],[OCCFLAGS="$OCCFLAGS -DHAVE_LIMITS"])
|
||||
AC_CHECK_HEADER([limits.h],[OCCFLAGS="$OCCFLAGS -DHAVE_LIMITS_H"])
|
||||
|
||||
|
||||
|
||||
AC_CONFIG_FILES(Makefile libsrc/Makefile libsrc/csg/Makefile libsrc/general/Makefile \
|
||||
libsrc/geom2d/Makefile libsrc/gprim/Makefile libsrc/include/Makefile libsrc/interface/Makefile \
|
||||
libsrc/linalg/Makefile libsrc/meshing/Makefile libsrc/occ/Makefile libsrc/opti/Makefile \
|
||||
libsrc/parallel/Makefile libsrc/stlgeom/Makefile libsrc/visualization/Makefile ng/Makefile \
|
||||
tutorials/Makefile)
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
AM_CPPFLAGS =
|
||||
|
||||
METASOURCES = AUTO
|
||||
|
||||
SUBDIRS = csg general geom2d gprim include interface linalg meshing occ opti \
|
||||
parallel stlgeom visualization
|
||||
|
||||
@ -103,6 +103,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -119,6 +119,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -117,6 +117,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
AM_CPPFLAG = -I$(top_srcdir)/libsrc/include
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include
|
||||
METASOURCES = AUTO
|
||||
noinst_LIBRARIES = libgeom2d.a
|
||||
libgeom2d_a_SOURCES = genmesh2d.cpp geom2dmesh.cpp spline.cpp \
|
||||
|
||||
@ -113,6 +113,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
@ -181,7 +182,7 @@ target_alias = @target_alias@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
AM_CPPFLAG = -I$(top_srcdir)/libsrc/include
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include
|
||||
METASOURCES = AUTO
|
||||
noinst_LIBRARIES = libgeom2d.a
|
||||
libgeom2d_a_SOURCES = genmesh2d.cpp geom2dmesh.cpp spline.cpp \
|
||||
|
||||
@ -114,6 +114,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -91,6 +91,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -2,24 +2,16 @@
|
||||
#define FILE_MYSTDLIB
|
||||
|
||||
|
||||
#include <config.h>
|
||||
|
||||
|
||||
|
||||
#include <iostream>
|
||||
#include <iomanip>
|
||||
#include <fstream>
|
||||
#include <sstream>
|
||||
|
||||
#ifdef OLDCINCLUDE
|
||||
|
||||
// e.g., CC compiler on SGI
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <math.h>
|
||||
#include <malloc.h>
|
||||
#include <ctype.h>
|
||||
#include <time.h>
|
||||
|
||||
#else
|
||||
|
||||
// new standard
|
||||
#include <cstdlib>
|
||||
#include <cstdio>
|
||||
#include <cmath>
|
||||
@ -27,8 +19,6 @@
|
||||
#include <ctime>
|
||||
#include <cstring>
|
||||
#include <climits>
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#include <new>
|
||||
|
||||
@ -124,6 +124,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -113,6 +113,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -127,6 +127,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -1,6 +1,12 @@
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(OCCFLAGS)
|
||||
|
||||
# $(OCC_INC_FLAG)
|
||||
|
||||
METASOURCES = AUTO
|
||||
|
||||
noinst_LIBRARIES = libocc.a
|
||||
|
||||
libocc_a_SOURCES = Partition_Inter2d.cxx Partition_Inter3d.cxx \
|
||||
Partition_Loop.cxx Partition_Loop2d.cxx Partition_Loop3d.cxx Partition_Spliter.cxx \
|
||||
occconstruction.cpp occgenmesh.cpp occgeom.cpp occmeshsurf.cpp
|
||||
|
||||
@ -116,6 +116,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
@ -184,7 +185,9 @@ target_alias = @target_alias@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(OCCFLAGS)
|
||||
|
||||
# $(OCC_INC_FLAG)
|
||||
METASOURCES = AUTO
|
||||
noinst_LIBRARIES = libocc.a
|
||||
libocc_a_SOURCES = Partition_Inter2d.cxx Partition_Inter3d.cxx \
|
||||
|
||||
@ -29,6 +29,7 @@
|
||||
// $Header: /cvs/netgen/netgen/libsrc/occ/Partition_Inter2d.cxx,v 1.5 2008/03/31 14:20:28 wabro Exp $
|
||||
|
||||
//using namespace std;
|
||||
|
||||
#include "Partition_Inter2d.ixx"
|
||||
|
||||
#include "utilities.h"
|
||||
|
||||
@ -1091,20 +1091,18 @@ namespace netgen
|
||||
|
||||
IGESControl_Reader reader;
|
||||
|
||||
#ifdef OCC52
|
||||
Standard_Integer stat = reader.ReadFile((char*)filename);
|
||||
#else
|
||||
Standard_Integer stat = reader.LoadFile((char*)filename);
|
||||
reader.Clear();
|
||||
#endif
|
||||
|
||||
// pre OCC52-times:
|
||||
// Standard_Integer stat = reader.LoadFile((char*)filename);
|
||||
// reader.Clear();
|
||||
|
||||
|
||||
#ifdef OCC52
|
||||
reader.TransferRoots(); // Tranlate IGES -> OCC
|
||||
#else
|
||||
reader.TransferRoots(Standard_False); // Tranlate IGES -> OCC
|
||||
#endif
|
||||
|
||||
// pre OCC52-times:
|
||||
// reader.TransferRoots(Standard_False); // Tranlate IGES -> OCC
|
||||
|
||||
//reader.PrintTransferInfo(IFSelect_FailAndWarn,IFSelect_ListByItem);
|
||||
|
||||
occgeo->shape = reader.OneShape();
|
||||
|
||||
@ -11,9 +11,9 @@
|
||||
|
||||
#include <meshing.hpp>
|
||||
|
||||
#include "BRep_Tool.hxx"
|
||||
#include "Geom_Curve.hxx"
|
||||
#include "Geom2d_Curve.hxx"
|
||||
#include <BRep_Tool.hxx>
|
||||
#include <Geom_Curve.hxx>
|
||||
#include <Geom2d_Curve.hxx>
|
||||
#include "Geom_Surface.hxx"
|
||||
#include "GeomAPI_ProjectPointOnSurf.hxx"
|
||||
#include "GeomAPI_ProjectPointOnCurve.hxx"
|
||||
|
||||
112
libsrc/occ/utilities.h
Normal file
112
libsrc/occ/utilities.h
Normal file
@ -0,0 +1,112 @@
|
||||
// SALOME Utils : general SALOME's definitions and tools
|
||||
//
|
||||
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public
|
||||
// License as published by the Free Software Foundation; either
|
||||
// version 2.1 of the License.
|
||||
//
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
// Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
//
|
||||
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
|
||||
//
|
||||
//
|
||||
//
|
||||
// File : utilities.h
|
||||
// Author : Antoine YESSAYAN, Paul RASCLE, EDF
|
||||
// Module : SALOME
|
||||
// $Header: /cvs/netgen/netgen/libsrc/occ/utilities.h,v 1.3 2008/03/31 14:20:28 wabro Exp $
|
||||
|
||||
/* --- Definition macros file to print informations if _DEBUG_ is defined --- */
|
||||
|
||||
#ifndef UTILITIES_H
|
||||
#define UTILITIES_H
|
||||
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include <cstdlib>
|
||||
// #include "SALOME_Log.hxx"
|
||||
|
||||
/* --- INFOS is always defined (without _DEBUG_): to be used for warnings, with release version --- */
|
||||
|
||||
#define INFOS(msg) {SLog->putMessage(*SLog<<__FILE__<<" ["<<__LINE__<<"] : "<<msg<<endl);}
|
||||
#define PYSCRIPT(msg) {SLog->putMessage(*SLog<<"---PYSCRIPT--- "<<msg<<endl);}
|
||||
|
||||
/* --- To print date and time of compilation of current source --- */
|
||||
|
||||
#if defined ( __GNUC__ )
|
||||
#define COMPILER "g++"
|
||||
#elif defined ( __sun )
|
||||
#define COMPILER "CC"
|
||||
#elif defined ( __KCC )
|
||||
#define COMPILER "KCC"
|
||||
#elif defined ( __PGI )
|
||||
#define COMPILER "pgCC"
|
||||
#elif defined ( __alpha )
|
||||
#define COMPILER "cxx"
|
||||
#else
|
||||
#define COMPILER "undefined"
|
||||
#endif
|
||||
|
||||
#ifdef INFOS_COMPILATION
|
||||
#error INFOS_COMPILATION already defined
|
||||
#endif
|
||||
|
||||
#define INFOS_COMPILATION { \
|
||||
SLog->putMessage(\
|
||||
*SLog<<__FILE__<<" ["<< __LINE__<<"] : "\
|
||||
<< "COMPILED with " << COMPILER \
|
||||
<< ", " << __DATE__ \
|
||||
<< " at " << __TIME__ <<endl); }
|
||||
|
||||
#ifdef _DEBUG_
|
||||
|
||||
/* --- the following MACROS are useful at debug time --- */
|
||||
|
||||
#define MYTRACE *SLog << "- Trace " << __FILE__ << " [" << __LINE__ << "] : "
|
||||
|
||||
#define MESSAGE(msg) {SLog->putMessage( MYTRACE <<msg<<endl<<ends); }
|
||||
#define SCRUTE(var) {SLog->putMessage( MYTRACE << #var << "=" << var <<endl<<ends); }
|
||||
|
||||
#define REPERE *SLog << " --------------" << endl
|
||||
#define BEGIN_OF(msg) {REPERE;MYTRACE<<"Begin of: " <<msg<<endl;REPERE;}
|
||||
#define END_OF(msg) {REPERE;MYTRACE<<"Normal end of: "<<msg<<endl;REPERE;}
|
||||
|
||||
#define HERE {cout<<flush ;cerr<<"- Trace "<<__FILE__<<" ["<<__LINE__<<"] : "<<flush ;}
|
||||
|
||||
#define INTERRUPTION(code) {HERE;cerr<<"INTERRUPTION return code= "<<code<< endl;std::exit(code);}
|
||||
|
||||
#ifndef ASSERT
|
||||
#define ASSERT(condition) \
|
||||
if (!(condition)){HERE;cerr<<"CONDITION "<<#condition<<" NOT VERIFIED"<<endl;INTERRUPTION(1);}
|
||||
#endif /* ASSERT */
|
||||
|
||||
|
||||
#else /* ifdef _DEBUG_*/
|
||||
|
||||
#define HERE
|
||||
#define SCRUTE(var) {}
|
||||
#define MESSAGE(msg) {}
|
||||
#define REPERE
|
||||
#define BEGIN_OF(msg) {}
|
||||
#define END_OF(msg) {}
|
||||
|
||||
#define INTERRUPTION(code) {}
|
||||
|
||||
#ifndef ASSERT
|
||||
#define ASSERT(condition) {}
|
||||
#endif /* ASSERT */
|
||||
|
||||
|
||||
#endif /* ifdef _DEBUG_*/
|
||||
|
||||
#endif /* ifndef UTILITIES_H */
|
||||
@ -113,6 +113,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -91,6 +91,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -114,6 +114,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -DOPENGL $(OCCFLAGS)
|
||||
METASOURCES = AUTO
|
||||
noinst_LIBRARIES = libvisual.a
|
||||
libvisual_a_SOURCES = meshdoc.cpp mvdraw.cpp stlmeshing.cpp vscsg.cpp \
|
||||
|
||||
@ -114,6 +114,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
@ -182,7 +183,7 @@ target_alias = @target_alias@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -DOPENGL $(OCCFLAGS)
|
||||
METASOURCES = AUTO
|
||||
noinst_LIBRARIES = libvisual.a
|
||||
libvisual_a_SOURCES = meshdoc.cpp mvdraw.cpp stlmeshing.cpp vscsg.cpp \
|
||||
|
||||
@ -1,9 +1,4 @@
|
||||
if OCC
|
||||
OCCLIBS = -lTKBRep -lTKIGES -lTKSTEP -lTKSTL
|
||||
endif
|
||||
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface $(OCCFLAGS)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL $(OCCFLAGS)
|
||||
|
||||
METASOURCES = AUTO
|
||||
bin_PROGRAMS = netgen
|
||||
@ -21,4 +16,3 @@ netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.a \
|
||||
|
||||
|
||||
|
||||
# AM_CXXFLAGS = -DOPENGL
|
||||
|
||||
@ -48,6 +48,7 @@ PROGRAMS = $(bin_PROGRAMS)
|
||||
am_netgen_OBJECTS = demoview.$(OBJEXT) ngappinit.$(OBJEXT) \
|
||||
ngpkg.$(OBJEXT) onetcl.$(OBJEXT)
|
||||
netgen_OBJECTS = $(am_netgen_OBJECTS)
|
||||
am__DEPENDENCIES_1 =
|
||||
netgen_DEPENDENCIES = $(top_builddir)/libsrc/csg/libcsg.a \
|
||||
$(top_builddir)/libsrc/geom2d/libgeom2d.a \
|
||||
$(top_builddir)/libsrc/interface/libinterface.a \
|
||||
@ -58,7 +59,8 @@ netgen_DEPENDENCIES = $(top_builddir)/libsrc/csg/libcsg.a \
|
||||
$(top_builddir)/libsrc/gprim/libgprim.a \
|
||||
$(top_builddir)/libsrc/opti/libopti.a \
|
||||
$(top_builddir)/libsrc/linalg/libla.a \
|
||||
$(top_builddir)/libsrc/general/libgeneral.a
|
||||
$(top_builddir)/libsrc/general/libgeneral.a \
|
||||
$(am__DEPENDENCIES_1)
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
@ -124,6 +126,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
@ -192,9 +195,7 @@ target_alias = @target_alias@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
|
||||
# AM_CXXFLAGS =
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface $(OCCFLAGS)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL $(OCCFLAGS)
|
||||
METASOURCES = AUTO
|
||||
netgen_SOURCES = demoview.cpp ngappinit.cpp ngpkg.cpp onetcl.cpp
|
||||
netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.a \
|
||||
@ -486,9 +487,6 @@ uninstall-am: uninstall-binPROGRAMS
|
||||
pdf pdf-am ps ps-am tags uninstall uninstall-am \
|
||||
uninstall-binPROGRAMS
|
||||
|
||||
@OCC_TRUE@ OCCLIBS = -lTKBRep -lTKIGES -lTKSTEP -lTKSTL
|
||||
|
||||
# AM_CXXFLAGS = -DOPENGL
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
||||
@ -101,6 +101,7 @@ NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OCCFLAGS = @OCCFLAGS@
|
||||
OCCLIBS = @OCCLIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
Loading…
Reference in New Issue
Block a user