From baa67899a970ea59b5080c51820e4b662d85ce0f Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Wed, 3 Sep 2014 13:27:28 +0000 Subject: [PATCH] occ fixes --- configure.ac | 2 +- libsrc/occ/Partition_Loop2d.cxx | 4 ++-- m4/tcl.m4 | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 7f8f5160..f9758cce 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,7 @@ AC_ARG_WITH([occ], if test a$occon = atrue ; then - AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc -I/usr/include/opencascade"]) + AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc -I/usr/include/oce"]) AC_SUBST([OCCLIBS], ["-L$occdir/lib -lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF -lFWOSPlugin"]) # -lTKDCAF diff --git a/libsrc/occ/Partition_Loop2d.cxx b/libsrc/occ/Partition_Loop2d.cxx index d980a5cb..81e484c9 100644 --- a/libsrc/occ/Partition_Loop2d.cxx +++ b/libsrc/occ/Partition_Loop2d.cxx @@ -210,7 +210,7 @@ static Standard_Boolean SelectEdge(const BRepAdaptor_Surface& Surf, Cc->D1(uc, PC, CTg1); if (!isForward) CTg1.Reverse(); - Standard_Real anglemin = 3 * PI, tolAng = 1.e-8; + Standard_Real anglemin = 3 * M_PI, tolAng = 1.e-8; // select an edge whose first derivative is most left of CTg1 // ie an angle between Tg1 and CTg1 is least @@ -234,7 +234,7 @@ static Standard_Boolean SelectEdge(const BRepAdaptor_Surface& Surf, // -PI < angle < PI Standard_Real angle = Tg1.Angle(CTg1); - if (PI - Abs(angle) <= tolAng) + if (M_PI - Abs(angle) <= tolAng) { // an angle is too close to PI; assure that an angle sign really // reflects an edge position: +PI - an edge is worst, diff --git a/m4/tcl.m4 b/m4/tcl.m4 index 55c0e06a..acb5a5db 100644 --- a/m4/tcl.m4 +++ b/m4/tcl.m4 @@ -139,6 +139,7 @@ AC_DEFUN([TEA_PATH_TCLCONFIG], [ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ + `ls -d /usr/lib/tcl8.5 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do if test -f "$i/tclConfig.sh" ; then @@ -279,6 +280,7 @@ AC_DEFUN([TEA_PATH_TKCONFIG], [ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ + `ls -d /usr/lib/tk8.5 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do if test -f "$i/tkConfig.sh" ; then