Commit 4595b596 authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas

Merge branch 'hotfix/1.6.3' into develop

parents 2365a390 8d4f2e7a
# ChangeLog
## version 1.6.3 - 2018-11-08
- fix for conda and DTK_INSTALL_PREFIX
## version 1.6.2 - 2018-11-08
- dtkScriptInterpreterPython enables release method (for real).
## version 1.6.1 - 2018-11-08
......
......@@ -24,7 +24,7 @@ project(dtk)
set(dtk_VERSION_MAJOR 1)
set(dtk_VERSION_MINOR 6)
set(dtk_VERSION_PATCH 2)
set(dtk_VERSION_PATCH 3)
set(dtk_VERSION
${dtk_VERSION_MAJOR}.${dtk_VERSION_MINOR}.${dtk_VERSION_PATCH})
......
......@@ -28,7 +28,7 @@ int main(int argc, char **argv)
dtkDistributedGuiApplication *application = dtkDistributedGuiApplication::create(argc, argv);
application->setApplicationName("dtkComposerEvaluator");
application->setApplicationVersion("1.5.1");
application->setApplicationVersion("1.6.3");
application->setOrganizationName("inria");
application->setOrganizationDomain("fr");
bool no_gui = application->noGui();
......
......@@ -23,7 +23,7 @@ int main(int argc, char **argv)
{
dtkCoreApplication *application = dtkCoreApplication::create(argc, argv);
application->setApplicationName("dtkDistributedServer");
application->setApplicationVersion("1.5.1");
application->setApplicationVersion("1.6.3");
application->setOrganizationName("inria");
application->setOrganizationDomain("fr");
......
......@@ -114,8 +114,9 @@ namespace dtkComposer
composer_settings.endGroup();
if (realpath.isEmpty()) {
realpath = QDir(DTK_INSTALL_PREFIX).filePath("plugins/dtkComposer");
QString dtk_prefix = DTK_INSTALL_PREFIX;
// ugly: remove null characters added by conda
realpath = QDir::cleanPath(dtk_prefix.remove(QChar::Null) + "/plugins/dtkComposer");
dtkDebug() << "no composer plugin path configured, use default:" << realpath ;
}
pluginManager().initialize(realpath);
......
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