ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-25 10:27:55 +05:00
Code Issues Packages Projects Releases Wiki Activity

Use additional functions of MGKEYGEN for version detection to work on Windows (thanks to Nabil)

Browse Source
This commit is contained in:
Christophe Bourcier 2023-05-03 15:50:53 +02:00
parent 2c178ca2ed
commit 23a2fe916c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/SMESHUtils/SMESH_MGLicenseKeyGen.cxx
View File

@ -653,58 +653,58 @@ namespace SMESHUtils_MGLicenseKeyGen // API implementation
return v_min; return v_min;
typedef int (*GetKeyFun)(); typedef int (*GetKeyFun)();
GetKeyFun keyFun = (GetKeyFun) GetProc( theLibraryHandle, "meshgems_core_get_version_minor" ); GetKeyFun keyFun = (GetKeyFun) GetProc( theLibraryHandle, "GetVersionMinor" );
if ( !keyFun ) if ( !keyFun )
{ {
if ( ! getLastError( error )) if ( ! getLastError( error ))
error = SMESH_Comment( "Can't find symbol 'meshgems_core_get_version_minor' in '") << getenv( theEnvVar ) << "'"; error = SMESH_Comment( "Can't find symbol 'GetVersionMinor' in '") << getenv( theEnvVar ) << "'";
} }
else else
{ {
v_min = keyFun( ); v_min = keyFun( );
} }
if ( v_min==-1 ) if ( v_min==-1 )
error = "meshgems_core_get_version_minor() failed (located in '" + libraryFile._name + "')"; error = "GetVersionMinor() failed (located in '" + libraryFile._name + "')";
MESSAGE("meshgems_core_get_version_minor: " << v_min); MESSAGE("GetVersionMinor: " << v_min);
// get major version // get major version
int v_maj = -1; int v_maj = -1;
typedef int (*GetKeyFun)(); typedef int (*GetKeyFun)();
keyFun = (GetKeyFun) GetProc( theLibraryHandle, "meshgems_core_get_version_major" ); keyFun = (GetKeyFun) GetProc( theLibraryHandle, "GetVersionMajor" );
if ( !keyFun ) if ( !keyFun )
{ {
if ( ! getLastError( error )) if ( ! getLastError( error ))
error = SMESH_Comment( "Can't find symbol 'meshgems_core_get_version_major' in '") << getenv( theEnvVar ) << "'"; error = SMESH_Comment( "Can't find symbol 'GetVersionMajor' in '") << getenv( theEnvVar ) << "'";
} }
else else
{ {
v_maj = keyFun( ); v_maj = keyFun( );
} }
if ( v_maj==-1 ) if ( v_maj==-1 )
error = "meshgems_core_get_version_major() failed (located in '" + libraryFile._name + "')"; error = "GetVersionMajor() failed (located in '" + libraryFile._name + "')";
MESSAGE("meshgems_core_get_version_major: " << v_maj); MESSAGE("GetVersionMajor: " << v_maj);
// get patch version // get patch version
int v_patch = -1; int v_patch = -1;
typedef int (*GetKeyFun)(); typedef int (*GetKeyFun)();
keyFun = (GetKeyFun) GetProc( theLibraryHandle, "meshgems_core_get_version_patch" ); keyFun = (GetKeyFun) GetProc( theLibraryHandle, "GetVersionPatch" );
if ( !keyFun ) if ( !keyFun )
{ {
if ( ! getLastError( error )) if ( ! getLastError( error ))
error = SMESH_Comment( "Can't find symbol 'meshgems_core_get_version_patch' in '") << getenv( theEnvVar ) << "'"; error = SMESH_Comment( "Can't find symbol 'GetVersionPatch' in '") << getenv( theEnvVar ) << "'";
} }
else else
{ {
v_patch = keyFun( ); v_patch = keyFun( );
} }
if ( v_patch==-1 ) if ( v_patch==-1 )
error = "meshgems_core_get_version_patch() failed (located in '" + libraryFile._name + "')"; error = "GetVersionPatch() failed (located in '" + libraryFile._name + "')";
MESSAGE("meshgems_core_get_version_patch: " << v_patch ); MESSAGE("GetVersionPatch: " << v_patch );
int v_hex = (v_maj << 16 | v_min << 8 | v_patch); int v_hex = (v_maj << 16 | v_min << 8 | v_patch);