789ddfe9ae
- Fix build with Netgen 6.2.2201 and later, add 0001-Fix-build-with-NG-6.2.2201-include-BRepMesh_Incremen.patch OBS-URL: https://build.opensuse.org/request/show/995251 OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=151
54 lines
2.0 KiB
Diff
54 lines
2.0 KiB
Diff
From d334b435006d81b31fd6a78651d2dbb11f4167e0 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
|
Date: Tue, 16 Aug 2022 00:05:17 +0200
|
|
Subject: [PATCH] Fix build with NG 6.2.2201+, include
|
|
BRepMesh_IncrementalMesh.hxx
|
|
|
|
Netgen commit 16b88e8e67a0 "OCC Mesher Cleanup" removed many OCC includes
|
|
from occgeom.hpp, e.g. BRepMesh_IncrementalMesh.hxx.
|
|
|
|
The missing headers and class definitions cause a compilation failure.
|
|
---
|
|
.../salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp | 3 +++
|
|
.../src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp | 2 ++
|
|
2 files changed, 5 insertions(+)
|
|
|
|
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
|
|
index 4dd8ed274e..95e7e4c04e 100644
|
|
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
|
|
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
|
|
@@ -50,7 +50,9 @@
|
|
|
|
#include <utilities.h>
|
|
|
|
+#include <BRepBndLib.hxx>
|
|
#include <BRepBuilderAPI_Copy.hxx>
|
|
+#include <BRepMesh_IncrementalMesh.hxx>
|
|
#include <BRep_Tool.hxx>
|
|
#include <Bnd_B3d.hxx>
|
|
#include <NCollection_Map.hxx>
|
|
@@ -66,6 +68,7 @@
|
|
#include <TopTools_DataMapOfShapeShape.hxx>
|
|
#include <TopTools_MapOfShape.hxx>
|
|
#include <TopoDS.hxx>
|
|
+#include <TopoDS_Solid.hxx>
|
|
|
|
#ifdef _MSC_VER
|
|
#pragma warning(disable : 4067)
|
|
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
|
|
index 2ebe4f87ac..72269e84db 100644
|
|
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
|
|
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
|
|
@@ -39,6 +39,8 @@
|
|
#include <StdMeshers_MaxElementArea.hxx>
|
|
#include <StdMeshers_QuadranglePreference.hxx>
|
|
#include <StdMeshers_ViscousLayers2D.hxx>
|
|
+#include <TopExp.hxx>
|
|
+#include <TopExp_Explorer.hxx>
|
|
|
|
#include <Precision.hxx>
|
|
#include <Standard_ErrorHandler.hxx>
|
|
--
|
|
2.37.1
|
|
|