Fix headers for >=KCalCore-5.12.0
AbandonedPublic

Authored by asturmlechner on Aug 16 2019, 2:29 PM.

Details

Reviewers
dfaure
vkrause
Group Reviewers
Calligra: 3.0

Diff Detail

Repository
R8 Calligra
Branch
kcalcore-5.12.0
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 15180
Build 15198: arc lint + arc unit
asturmlechner created this revision.Aug 16 2019, 2:29 PM
Restricted Application added a project: Calligra: 3.0. · View Herald TranscriptAug 16 2019, 2:29 PM
Restricted Application added a subscriber: Calligra-Devel-list. · View Herald Transcript
asturmlechner requested review of this revision.Aug 16 2019, 2:29 PM
dfaure requested changes to this revision.Aug 16 2019, 3:46 PM
dfaure added a reviewer: vkrause.
dfaure added inline comments.
plan/src/plugins/filters/icalendar/export/icalendarexport.cpp
30

You can't test for the version number before including kcal[endar]core_version.h ... catch 22.

This is going to need a cmake check for which header is available.

Or kcalendarcore could keep installing a kcalcore_version.h file with the same contents as kcalendarcore_version.h?

But then I also wonder if one day kcalendarcore_version.h will define KCALENDARCORE_VERSION rather than KCALCORE_VERSION... sounds like it should do both then...

This revision now requires changes to proceed.Aug 16 2019, 3:47 PM

This isn't wrong, but I'm surprised it's needed, we explicitly install headers in the old location too, for compatibility?

This isn't wrong, but I'm surprised it's needed, we explicitly install headers in the old location too, for compatibility?

That does not seem to be the case on my system, kde-apps/kcalcore-19.08.0.

see https://cgit.kde.org/kcalcore.git/tree/src/CMakeLists.txt#n138 - seems to work here

But that leaves the problem of the version header, we also need to install that with the old name I think.

Version header backward compatibility addressed in D23204.

asturmlechner abandoned this revision.Aug 16 2019, 4:21 PM

Yes, I was being blind.

But that leaves the problem of the version header, we also need to install that with the old name I think.

Indeed that was the actual problem.