Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to paraview 5.4
[modules/gui.git]
/
src
/
CAM
/
CAM_Application.cxx
diff --git
a/src/CAM/CAM_Application.cxx
b/src/CAM/CAM_Application.cxx
index 473afae69e8a1dc5acbf4d43090a8d91d987dce6..59a7f7ed82a5886bc30d9bbfcc00abb42cb586af 100755
(executable)
--- a/
src/CAM/CAM_Application.cxx
+++ b/
src/CAM/CAM_Application.cxx
@@
-335,7
+335,7
@@
CAM_Module* CAM_Application::loadModule( const QString& modName, const bool show
getVersion = (GET_VERSION_FUNC)::GetProcAddress( modLib, GET_VERSION_NAME );
}
#else
getVersion = (GET_VERSION_FUNC)::GetProcAddress( modLib, GET_VERSION_NAME );
}
#else
- void* modLib = dlopen( libName.toLatin1(), RTLD_LAZY );
+ void* modLib = dlopen( libName.toLatin1(), RTLD_LAZY
| RTLD_GLOBAL
);
if ( !modLib )
err = QString( "Can not load library %1. %2" ).arg( libName ).arg( dlerror() );
else
if ( !modLib )
err = QString( "Can not load library %1. %2" ).arg( libName ).arg( dlerror() );
else
@@
-771,8
+771,10
@@
void CAM_Application::readModuleList()
if ( !modLibrary.isEmpty() )
{
modLibrary = SUIT_Tools::file( modLibrary.trimmed() );
if ( !modLibrary.isEmpty() )
{
modLibrary = SUIT_Tools::file( modLibrary.trimmed() );
-#if
def WIN32
+#if
defined(WIN32)
QString libExt = QString( "dll" );
QString libExt = QString( "dll" );
+#elif defined(__APPLE__)
+ QString libExt = QString( "dylib" );
#else
QString libExt = QString( "so" );
#endif
#else
QString libExt = QString( "so" );
#endif