kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Guard MEFISTO code with version check against SMESH.

Browse Source
This commit is contained in:
Alexander Neumann
2023-12-17 22:58:04 +01:00
committed by Chris Hennes
parent 71df82dad3
commit 2bf42925f5
7 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/MeshPart/App/CMakeLists.txt
View File

@@ -1,5 +1,8 @@
if (BUILD_SMESH)
add_definitions(-DHAVE_SMESH -DHAVE_MEFISTO)
add_definitions(-DHAVE_SMESH)
if(SMESH_VERSION_MAJOR LESS_EQUAL 9 AND SMESH_VERSION_MINOR LESS 10 )
add_definitions(-DHAVE_MEFISTO)
endif()
endif(BUILD_SMESH)
if(BUILD_FEM_NETGEN)

4
src/Mod/MeshPart/App/Mesher.cpp
View File

@@ -61,7 +61,9 @@
#include <StdMeshers_AutomaticLength.hxx>
#include <StdMeshers_Deflection1D.hxx>
#include <StdMeshers_LocalLength.hxx>
#if SMESH_VERSION_MAJOR <= 9 && SMESH_VERSION_MINOR < 10
#include <StdMeshers_MEFISTO_2D.hxx>
#endif
#include <StdMeshers_MaxElementArea.hxx>
#include <StdMeshers_NumberOfSegments.hxx>
#include <StdMeshers_QuadranglePreference.hxx>
@@ -409,6 +411,7 @@ Mesh::MeshObject* Mesher::createMesh() const
hypoth.push_back(alg2d);
} break;
#endif
#if SMESH_VERSION_MAJOR <= 9 && SMESH_VERSION_MINOR < 10
#if defined(HAVE_MEFISTO)
case Mefisto: {
if (maxLength > 0) {
@@ -499,6 +502,7 @@ Mesh::MeshObject* Mesher::createMesh() const
#endif
hypoth.push_back(alg2d);
} break;
#endif
#endif
default:
break;

5
src/Mod/MeshPart/Gui/CMakeLists.txt
View File

@@ -1,5 +1,8 @@
if (BUILD_SMESH)
add_definitions(-DHAVE_SMESH -DHAVE_MEFISTO)
add_definitions(-DHAVE_SMESH)
if(SMESH_VERSION_MAJOR LESS_EQUAL 9 AND SMESH_VERSION_MINOR LESS 10 )
add_definitions(-DHAVE_MEFISTO)
endif()
endif(BUILD_SMESH)
if(BUILD_FEM_NETGEN)