Fix with OpenCascade 7.8.0. (#1306)

f3d-app · Mar 10, 2024 · f0ecafb · f0ecafb
1 parent 680aff9
commit f0ecafb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/plugins/occt/CMakeLists.txt b/plugins/occt/CMakeLists.txt
@@ -17,7 +17,13 @@ if("${OpenCASCADE_VERSION}" VERSION_LESS "7.5.0")
   message(FATAL_ERROR "Plugin: OpenCASCADE: ${OpenCASCADE_VERSION} is not supported by F3D, please update your OpenCASCADE installation.")
 endif()
 
-if((NOT TARGET "TKSTEP") AND (NOT TARGET "TKIGES") AND (NOT TARGET "TKMesh"))
+if("${OpenCASCADE_VERSION}" VERSION_LESS "7.8.0")
+  if((NOT TARGET "TKSTEP") AND (NOT TARGET "TKIGES") AND (NOT TARGET "TKMesh"))
+    message(FATAL_ERROR "Plugin: OpenCASCADE does not contain required modules")
+  endif()
+endif()
+
+if((NOT TARGET "TKDESTEP") AND (NOT TARGET "TKDEIGES") AND (NOT TARGET "TKMesh"))
     message(FATAL_ERROR "Plugin: OpenCASCADE does not contain required modules")
 endif()
 
@@ -27,8 +33,14 @@ option(F3D_PLUGIN_OCCT_COLORING_SUPPORT "Enable coloring support in occt plugin"
 mark_as_advanced(F3D_PLUGIN_OCCT_COLORING_SUPPORT)
 
 if(F3D_PLUGIN_OCCT_COLORING_SUPPORT)
-  if (NOT (TARGET "TKXDESTEP") OR NOT (TARGET "TKXDEIGES"))
+  if("${OpenCASCADE_VERSION}" VERSION_LESS "7.8.0")
+    if (NOT (TARGET "TKXDESTEP") OR NOT (TARGET "TKXDEIGES"))
       message(FATAL_ERROR "occt plugin: TKXDESTEP and TKXDEIGES OCCT modules are not found. Turn off F3D_PLUGIN_OCCT_COLORING_SUPPORT or enable them in your OpenCascade build.")
+    endif()
+  else()
+    if (NOT (TARGET "TKXSDRAWSTEP") OR NOT (TARGET "TKXSDRAWIGES"))
+        message(FATAL_ERROR "occt plugin: TKXSDRAWSTEP and TKXSDRAWIGES OCCT modules are not found. Turn off F3D_PLUGIN_OCCT_COLORING_SUPPORT or enable them in your OpenCascade build.")
+    endif()
   endif()
 endif()
 

diff --git a/plugins/occt/module/vtkF3DOCCTReader.cxx b/plugins/occt/module/vtkF3DOCCTReader.cxx
@@ -31,6 +31,7 @@
 #if F3D_PLUGIN_OCCT_XCAF
 #include <IGESCAFControl_Reader.hxx>
 #include <STEPCAFControl_Reader.hxx>
+#include <Standard_Version.hxx>
 #include <TDF_ChildIterator.hxx>
 #include <TDataStd_Name.hxx>
 #include <TDocStd_Document.hxx>
@@ -487,7 +488,11 @@ class vtkF3DOCCTReader::vtkInternals
   int GetHash(const TDF_Label& label)
   {
     TopoDS_Shape aShape;
+#if OCC_VERSION_HEX < 0x070800
     return this->ShapeTool->GetShape(label, aShape) ? aShape.HashCode(INT_MAX) : 0;
+#else
+    return this->ShapeTool->GetShape(label, aShape) ? std::hash<TopoDS_Shape>{}(aShape) : 0;
+#endif
   }
 
   //----------------------------------------------------------------------------