diff --git a/cmake/FindJulia.cmake b/cmake/FindJulia.cmake --- a/cmake/FindJulia.cmake +++ b/cmake/FindJulia.cmake @@ -61,8 +61,14 @@ # # Julia library location # +if(${JULIA_VERSION_STRING} VERSION_LESS 0.7.0) + set(JULIA_LIBDL_COMMAND "abspath(dirname(Libdl.dlpath(\"libjulia\")))") +else() + set(JULIA_LIBDL_COMMAND "using Libdl\; abspath(dirname(Libdl.dlpath(\"libjulia\")))") +endif() + execute_process( - COMMAND ${JULIA_EXECUTABLE} -E "abspath(dirname(Libdl.dlpath(\"libjulia\")))" + COMMAND ${JULIA_EXECUTABLE} -E ${JULIA_LIBDL_COMMAND} OUTPUT_VARIABLE JULIA_LIBRARY_DIR RESULT_VARIABLE RESULT ) diff --git a/src/backends/julia/juliaserver/juliaserver.cpp b/src/backends/julia/juliaserver/juliaserver.cpp --- a/src/backends/julia/juliaserver/juliaserver.cpp +++ b/src/backends/julia/juliaserver/juliaserver.cpp @@ -43,7 +43,7 @@ void JuliaServer::login(const QString &path) const { -#if JULIA_VERSION_MINOR > 5 +#if QT_VERSION_CHECK(JULIA_VERSION_MAJOR, JULIA_VERSION_MINOR, 0) >= QT_VERSION_CHECK(0, 6, 0) Q_UNUSED(path) jl_init(); #else