port to smesh 8.3

using #ifdef EXTERNAL_SMESH for the diff
2018-04-17 21:22:26 +02:00
parent 5941a32f71
commit 21cdc9ea4a
15 changed files with 84 additions and 10 deletions
--- a/src/Mod/Fem/App/FemMeshShapeObject.cpp
+++ b/src/Mod/Fem/App/FemMeshShapeObject.cpp
@@ -61,7 +61,9 @@
 #include <StdMeshers_QuadraticMesh.hxx>
 #include <StdMeshers_RadialPrism_3D.hxx>
 #include <StdMeshers_SegmentAroundVertex_0D.hxx>
-#include <StdMeshers_TrianglePreference.hxx>
+#ifndef EXTERNAL_SMESH
+    #include <StdMeshers_TrianglePreference.hxx>
+#endif
 #include <StdMeshers_ProjectionSource1D.hxx>
 #include <StdMeshers_ProjectionSource2D.hxx>
 #include <StdMeshers_ProjectionSource3D.hxx>