Improve new MG license mechanism to be binary compatible 2.14/2.15

diff --git a/src/HYBRIDPlugin/MG_HYBRID_API.cxx b/src/HYBRIDPlugin/MG_HYBRID_API.cxx
index d2b9ed8b26eadaff3ceeea876f98e3af3de1ec27..9d7383f7e94622173d53d76ceebd187d261785ad 100644 (file)
--- a/src/HYBRIDPlugin/MG_HYBRID_API.cxx
+++ b/src/HYBRIDPlugin/MG_HYBRID_API.cxx
@@ -36,9 +36,6 @@ extern "C"{
 #include <meshgems/hybrid.h>
 }
 
-#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 );