Commit 588060b2 authored by saubatn's avatar saubatn

FIXED Bug 160.

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@753 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 30d5ee34
......@@ -44,7 +44,7 @@ void ExtensionManager::autoload() {
// add the private lib dir to the current application environment's PATH variable
// This modifies the current PATH variable in order for the OS to find the private
// libraries compiled as shared objects/dll/dylib needed by some extensions
QDir privateLibDir(Core::getGlobalInstallDir());
QDir privateLibDir(Core::getGlobalInstallDir());
if (privateLibDir.cd("lib/"+QString(Core::shortVersion))) {
QByteArray privateLibDirPath = privateLibDir.canonicalPath().toUtf8();
QByteArray path = qgetenv("PATH");
......@@ -52,9 +52,10 @@ void ExtensionManager::autoload() {
path.append(privateLibDirPath);
qputenv("PATH",path);
}
autoloadComponentExtensions();
autoloadActionExtensions();
}
// -------------------- getComponentExtensionMap --------------------
......@@ -313,8 +314,8 @@ void ExtensionManager::loadActionExtension(QDir actionsDir) {
QMessageBox::information(NULL, "ExtensionManager Autoload Error", "Cannot access to actions directory:<br/><tt>" + actionsDir.absolutePath() + "</tt><br/>Directory does not exist!");
}
else {
QStringList pluginFileNames = getPluginFileNames(actionsDir);
QStringList pluginFileNames = getPluginFileNames(actionsDir);
// if there is more than 5 dependency levels, then you have two choices:
// - consider simplifying your component
// - increase maxNumberOfTries
......@@ -461,8 +462,11 @@ QStringList ExtensionManager::getPluginFileNames(QDir extensionsDir) {
// loop to load component plugin, taking into account internal dependencies (i.e. dependency between
// one component and another one.
QStringList pluginFileNames = extensionsDir.entryList(getExtensionFilter(), QDir::Files);
// Get the MSVC debug dlls
QStringList pluginFileNamesDebug = pluginFileNames.filter(QRegExp(".*"+QString(Core::debugPostfix)+".dll"));
QStringList pluginFileNamesDebugMSVC = pluginFileNames.filter(QRegExp(".*"+QString(Core::debugPostfix)+".dll"));
#ifdef WIN32
if (Core::isDebugBuild()) {
return pluginFileNamesDebug;
}
......@@ -473,6 +477,10 @@ QStringList ExtensionManager::getPluginFileNames(QDir extensionsDir) {
}
return pluginFileNames;
}
#endif
return pluginFileNames;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment