Don't search for and link to libcln when using libqalculate>=2.0
ClosedPublic

Authored by arojas on Aug 28 2017, 4:40 PM.

Details

Summary

Step doesn't use any cln code directly, only via libqalculate. In version 2.0, libqalculate dropped cln in favor of gmp, so the cln dependency becomes unnecessary.

Test Plan

Builds and works with libqalculate 1.0 (which uses cln) and 2.0 (which doesn't)

Diff Detail

Repository
R341 Step
Lint
Lint Skipped
Unit
Unit Tests Skipped
arojas created this revision.Aug 28 2017, 4:40 PM
arojas updated this revision to Diff 18908.Aug 29 2017, 8:19 AM

Fix build without libqalculate

Shouldn't also the following line be changed (step/CMakeLists.txt)?

set(qalculate_LIBS ${QALCULATE_LIBRARIES} ${CLN_LIBRARIES})

I understand that CLN_LIBRARIES would be empty, so maybe it's not a real issue

Shouldn't also the following line be changed (step/CMakeLists.txt)?

set(qalculate_LIBS ${QALCULATE_LIBRARIES} ${CLN_LIBRARIES})

I understand that CLN_LIBRARIES would be empty, so maybe it's not a real issue

It compiles without issue with qalculate 2.0 (in which case CLN_LIBRARIES is not set), so I don't think it's worth complicating the code.

ltoscano accepted this revision.Aug 29 2017, 7:17 PM

I tested it with the older libqalculate, and the linking works as well. Let's go for it; is it for Applications/17.08 as you did with other similar commits?

This revision is now accepted and ready to land.Aug 29 2017, 7:17 PM

I tested it with the older libqalculate, and the linking works as well. Let's go for it; is it for Applications/17.08 as you did with other similar commits?

Yes, if there are no objections.

I'd say go for it.

This revision was automatically updated to reflect the committed changes.