From fa00b2251b41fa858339d534ec8e3625740998c0 Mon Sep 17 00:00:00 2001 From: Christophe Bourcier Date: Wed, 19 Apr 2023 14:36:48 +0200 Subject: [PATCH] Improve new MG license mechanism to be binary compatible 2.14/2.15 --- src/HYBRIDPlugin/MG_HYBRID_API.cxx | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/HYBRIDPlugin/MG_HYBRID_API.cxx b/src/HYBRIDPlugin/MG_HYBRID_API.cxx index d2b9ed8..9d7383f 100644 --- a/src/HYBRIDPlugin/MG_HYBRID_API.cxx +++ b/src/HYBRIDPlugin/MG_HYBRID_API.cxx @@ -36,9 +36,6 @@ extern "C"{ #include } -#define MESHGEMS_VERSION_HEX (MESHGEMS_VERSION_MAJOR << 16 | MESHGEMS_VERSION_MINOR << 8 | MESHGEMS_VERSION_PATCH) -#define MESHGEMS_215 (2 << 16 | 15 << 8 | 0) - struct MG_HYBRID_API::LibData { // MG objects @@ -702,24 +699,12 @@ bool MG_HYBRID_API::LibData::Compute() // MG license std::string errorTxt; status_t ret; -#if MESHGEMS_VERSION_HEX > MESHGEMS_215 - // unlock Hybrid license - std::string SPATIAL_LICENSE = SMESHUtils_MGLicenseKeyGen::GetKey(errorTxt); - ret = meshgems_hybrid_unlock_product(SPATIAL_LICENSE.c_str()); - if STATUS_IS_ERROR( ret ) - { - AddError( SMESH_Comment( "Problem with SPATIAL_LICENSE to unlock Hybrid: ") << errorTxt ); - return false; - } - else - MESSAGE("SPATIAL_LICENSE unlock Hybrid: " << ret); -#else - if ( !SMESHUtils_MGLicenseKeyGen::SignMesh( _surf_mesh, errorTxt )) + + if ( !SMESHUtils_MGLicenseKeyGen::SignMesh( _surf_mesh, "hybrid", errorTxt )) { AddError( SMESH_Comment( "Problem with library SalomeMeshGemsKeyGenerator: ") << errorTxt ); return false; } -#endif // Set surface mesh ret = hybrid_set_surface_mesh( _session, _surf_mesh ); -- 2.39.2