aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Semke <[email protected]>2018-01-15 20:16:33 +0100
committerAlexander Semke <[email protected]>2018-01-15 20:16:33 +0100
commitf00157cb23dcbb1e6d76a2d6090d9b53296edcf3 (patch)
treef1ec0f77bd8f4f31bd113783ede9854c3a94d359
parent061d596af97185b740e3bedf20036b839a5945ac (diff)
Fixed the build with julia 0.6-releases.
-rw-r--r--src/backends/julia/juliaserver/juliaserver.cpp5
-rw-r--r--src/backends/julia/juliasession.cpp2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/backends/julia/juliaserver/juliaserver.cpp b/src/backends/julia/juliaserver/juliaserver.cpp
index 04108ee..9c904fa 100644
--- a/src/backends/julia/juliaserver/juliaserver.cpp
+++ b/src/backends/julia/juliaserver/juliaserver.cpp
@@ -20,6 +20,7 @@
#include "juliaserver.h"
#include <julia/julia.h>
+#include <julia/julia_version.h>
#include <iostream>
#include <QFileInfo>
@@ -39,8 +40,12 @@ JuliaServer::~JuliaServer()
void JuliaServer::login(const QString &path) const
{
+#if JULIA_VERSION_MINOR > 5
+ jl_init();
+#else
QString dir_path = QFileInfo(path).dir().absolutePath();
jl_init(dir_path.toLatin1().constData());
+#endif
}
void JuliaServer::runJuliaCommand(const QString &command)
diff --git a/src/backends/julia/juliasession.cpp b/src/backends/julia/juliasession.cpp
index 5ba4171..d6cc6ae 100644
--- a/src/backends/julia/juliasession.cpp
+++ b/src/backends/julia/juliasession.cpp
@@ -34,6 +34,7 @@
#include "juliaextensions.h"
#include "juliabackend.h"
#include "juliacompletionobject.h"
+#include <julia/julia_version.h>
JuliaSession::JuliaSession(Cantor::Backend *backend)
: Session(backend)
@@ -108,6 +109,7 @@ void JuliaSession::login()
}
emit loginDone();
+ qDebug() << "login to julia " << JULIA_VERSION_STRING << "done";
}
void JuliaSession::logout()