bos #26515 [CEA 24622] Failing SMESH tests

Expose NETGEN version via NETGENPlugin.NETGEN_VERSION_MAJOR constant
  accessible as smeshBuilder.NETGEN_VERSION_MAJOR
This commit is contained in:
eap 2021-10-26 18:27:40 +03:00
parent d16cff04dd
commit 8ca0ca1fb6
4 changed files with 38 additions and 1 deletions

View File

@ -156,6 +156,12 @@ ENDIF(EXISTS ${SMESH_ROOT_DIR})
FIND_PACKAGE(SalomeNetgen REQUIRED)
ADD_DEFINITIONS(${NETGEN_DEFINITIONS})
IF (NETGEN_V6)
SET(NETGEN_VERSION_MAJOR 6)
ELSE()
SET(NETGEN_VERSION_MAJOR 5)
ENDIF()
# Detection summary:
SALOME_PACKAGE_REPORT_AND_CHECK()

View File

@ -25,10 +25,13 @@ INCLUDE_DIRECTORIES(
${GEOM_INCLUDE_DIRS}
${SMESH_INCLUDE_DIRS}
${PROJECT_BINARY_DIR}/idl
)
)
SALOME_CONFIGURE_FILE(NETGENPlugin_NETGEN_VERSION.idl.in NETGENPlugin_NETGEN_VERSION.idl)
SET(SalomeIDLNETGENPLUGIN_IDLSOURCES
NETGENPlugin_Algorithm.idl
NETGENPlugin_NETGEN_VERSION.idl
)
SET(_idl_include_dirs

View File

@ -0,0 +1,26 @@
// Copyright (C) 2007-2021 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
module NETGENPlugin
{
const short NETGEN_VERSION_MAJOR = @NETGEN_VERSION_MAJOR@ ;
};

View File

@ -34,6 +34,8 @@ except ImportError:
LIBRARY = "libNETGENEngine.so"
NETGEN_VERSION_MAJOR = NETGENPlugin.NETGEN_VERSION_MAJOR
#----------------------------
# Mesh algo type identifiers
#----------------------------