diff --git a/Geo/GModelIO_OCC.cpp b/Geo/GModelIO_OCC.cpp index 4fc99138b04e4279ccd0bfdc3ab62c796bd3f375..5105da9834135b9251b11b1cbe5507441ff492ec 100644 --- a/Geo/GModelIO_OCC.cpp +++ b/Geo/GModelIO_OCC.cpp @@ -1,4 +1,4 @@ - // $Id: GModelIO_OCC.cpp,v 1.4 2006-11-15 21:53:31 remacle Exp $ + // $Id: GModelIO_OCC.cpp,v 1.5 2006-11-16 01:56:52 geuzaine Exp $ // // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // @@ -360,12 +360,20 @@ void GModel::deleteOCCInternals() int GModel::readOCCSTEP(const std::string &fn) { - Msg(WARNING,"OpenCascade was not compiled with this version of gmsh, cannot load %s",fn.c_str()); + Msg(GERROR,"Gmsh has to be compiled with OpenCascade support to load %s", + fn.c_str()); return 0; } int GModel::readOCCIGES(const std::string &fn) { - Msg(WARNING,"OpenCascade was not compiled with this version of gmsh, cannot load %s",fn.c_str()); + Msg(GERROR,"Gmsh has to be compiled with OpenCascade support to load %s", + fn.c_str()); + return 0; +} +int GModel::readOCCBREP(const std::string &fn) +{ + Msg(GERROR,"Gmsh has to be compiled with OpenCascade support to load %s", + fn.c_str()); return 0; } void GModel::deleteOCCInternals() diff --git a/configure b/configure index 42e0b3d54aec52acb259f39de97456c641942447..361749314fc2d6efe40352163c88d10b4004688f 100755 --- a/configure +++ b/configure @@ -4575,7 +4575,7 @@ else fi if test "x${OCC}" = "xyes"; then - OCC_LIBS="-lTKSTEP -lTKXDESTEP -lTKSTEP209 -lTKSTEPAttr -lTKSTEPBase" + OCC_LIBS="-lTKSTEP -lTKXDESTEP -lTKSTEP209 -lTKSTEPAttr -lTKSTEPBase" OCC_LIBS="${OCC_LIBS} -lTKXDEIGES -lTKIGES -lTKXSBase -lTKStdSchema -lTKStdLSchema" OCC_LIBS="${OCC_LIBS} -lTKV3d -lTKV2d -lTKBool -lTKShHealing -lTKMesh -lTKPrim" OCC_LIBS="${OCC_LIBS} -lTKTopAlgo -lTKBRep -lTKGeomAlgo -lTKGeomBase -lTKG3d -lTKG2d" diff --git a/configure.in b/configure.in index 14e19a700c05f82931024363e12c3e3f9dfde1ba..a0c5d9ad9bac37f0c6a41fb1efdb51abc53e28f3 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.107 2006-11-15 20:46:36 geuzaine Exp $ +dnl $Id: configure.in,v 1.108 2006-11-16 01:56:51 geuzaine Exp $ dnl dnl Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle dnl @@ -557,7 +557,7 @@ if test "x$enable_occ" = "xyes"; then fi AC_CHECK_LIB(TKernel,main,OCC="yes",OCC="no") if test "x${OCC}" = "xyes"; then - OCC_LIBS="-lTKSTEP -lTKXDESTEP -lTKSTEP209 -lTKSTEPAttr -lTKSTEPBase" + OCC_LIBS="-lTKSTEP -lTKXDESTEP -lTKSTEP209 -lTKSTEPAttr -lTKSTEPBase" OCC_LIBS="${OCC_LIBS} -lTKXDEIGES -lTKIGES -lTKXSBase -lTKStdSchema -lTKStdLSchema" OCC_LIBS="${OCC_LIBS} -lTKV3d -lTKV2d -lTKBool -lTKShHealing -lTKMesh -lTKPrim" OCC_LIBS="${OCC_LIBS} -lTKTopAlgo -lTKBRep -lTKGeomAlgo -lTKGeomBase -lTKG3d -lTKG2d"