diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f9a2265eb9ac6dfc3d50895f05445557dc8d28d..720cc1814d11eb784adc5eb6d98ab955e4e13862 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -757,7 +757,7 @@ if(ENABLE_OCC) list(LENGTH OCC_LIBS NUM_OCC_LIBS) if(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED) find_path(OCC_INC "BRep_Tool.hxx" PATHS ENV CASROOT PATH_SUFFIXES inc - include opencascade) + include include/oce opencascade) if(OCC_INC) set_config_option(HAVE_OCC "OpenCascade") list(APPEND EXTERNAL_LIBRARIES ${OCC_LIBS}) diff --git a/Geo/OCCFace.cpp b/Geo/OCCFace.cpp index 7ea79f57be2c6389ba61125deca28df497e90035..b0cc5bb9e222aa5fcc8173bd09b140f9799e5860 100644 --- a/Geo/OCCFace.cpp +++ b/Geo/OCCFace.cpp @@ -338,9 +338,10 @@ bool OCCFace::buildSTLTriangulation(bool force) BRepBndLib::Add(s, aBox); BRepMesh_FastDiscret aMesher(0.1, 0.5, aBox, Standard_False, Standard_False, Standard_True, Standard_False); +#if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR < 5) aMesher.Add(s); -#if !((OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR < 5)) - aMesher.Process(s); +#else + aMesher.Perform(s); #endif TopLoc_Location loc;