Fix build with julia 1.0
ClosedPublic

Authored by arojas on Aug 20 2018, 11:11 PM.

Details

Summary

Adjust library cmake check for new syntax, and fix the version check in juliaserver.cpp to use the new API with 1.0

Test Plan

Builds with julia 0.6.4, 0.7.0 and 1.0.0

Diff Detail

Repository
R55 Cantor
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
arojas created this revision.Aug 20 2018, 11:11 PM
Restricted Application added a project: KDE Edu. · View Herald TranscriptAug 20 2018, 11:11 PM
Restricted Application added a subscriber: kde-edu. · View Herald Transcript
arojas requested review of this revision.Aug 20 2018, 11:11 PM
pino added a subscriber: pino.Aug 21 2018, 4:58 AM
pino added inline comments.
src/backends/julia/juliaserver/juliaserver.cpp
46

This can be simplified, and made it future-proof using QT_VERSION_CHECK:

#if QT_VERSION_CHECK(JULIA_VERSION_MAJOR, JULIA_VERSION_MINOR, 0) >= QT_VERSION_CHECK(0, 5, 0)
arojas updated this revision to Diff 40110.Aug 21 2018, 6:40 AM

Use QT_VERSION_CHECK macro

arojas updated this revision to Diff 40112.Aug 21 2018, 6:42 AM
arojas marked an inline comment as done.

Fix indentation

arojas updated this revision to Diff 40113.Aug 21 2018, 6:43 AM

Use correct version

Hi, @arojas
First, Thanks!
Second, I couldn't found julia 1.0.0. As I see, there are problems with JULIA_LIBDL_COMMAND: cmake drop ; symbol (I don't see the symbol in message output).
I add escaping for this symbol (\) and all start works fine.
Do you haven't problem with version 1.0.0?

Hi, @arojas
First, Thanks!
Second, I couldn't found julia 1.0.0. As I see, there are problems with JULIA_LIBDL_COMMAND: cmake drop ; symbol (I don't see the symbol in message output).
I add escaping for this symbol (\) and all start works fine.
Do you haven't problem with version 1.0.0?

I don't have this issue, perhaps it depends on the cmake version. It works for me also with escaping, so I can add it to be safe.

arojas updated this revision to Diff 40164.Aug 21 2018, 6:09 PM

Escape semicolon

sirgienko accepted this revision.Aug 21 2018, 6:24 PM
This revision is now accepted and ready to land.Aug 21 2018, 6:24 PM
This revision was automatically updated to reflect the committed changes.