Differential D15461

Finish fixing build when Origin is disabled
ClosedPublic
Actions

Authored by awilcox on Sep 12 2018, 5:23 PM.

Details

Reviewers
asemke
Group Reviewers
LabPlot
Commits
R262:6699907157c7: Finish fixing build when Origin is disabled.
Summary

datasources: Only include Origin header if enabled

ImportProjectDialog was still #including the OriginProjectParser header,
which caused a build error if -DENABLE_LIBORIGIN=OFF.

Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>
Fixes: d67faf643b2e69c017c21e9d9aaa1fe2d3de6b0e

Test suite: disable Origin tests when lib is disabled

Compiling with liborigin disabled caused a build failure while building
ProjectImportTest, because it still unconditionally #included
OriginProjectParser and called into Origin code.

Test Plan

Tested on LabPlot 2.5.0 and git master.

Diff Detail

Repository
R262 LabPlot
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 2773
Build 2791: arc lint + arc unit
awilcox created this revision.Sep 12 2018, 5:23 PM
Restricted Application added a project: KDE Edu. · View Herald TranscriptSep 12 2018, 5:23 PM
Restricted Application added a subscriber: kde-edu. · View Herald Transcript
awilcox requested review of this revision.Sep 12 2018, 5:23 PM
awilcox edited the summary of this revision. (Show Details)Sep 12 2018, 5:25 PM
awilcox added a reviewer: LabPlot.
awilcox added a project: LabPlot.
awilcox mentioned this in R262:d67faf643b2e: Fixed the build with -DENABLE_LIBORIGIN=OFF..
awilcox added a subscriber: LabPlot.
asemke accepted this revision.Sep 13 2018, 6:35 AM
asemke added a subscriber: asemke.

@awilcox thanks for catching this!

This revision is now accepted and ready to land.Sep 13 2018, 6:35 AM
asemke added a comment.Sep 16 2018, 7:43 AM

@awilcox will you push this commit or should I do this for you?

awilcox added a comment.Sep 16 2018, 4:24 PM

I would be happy to push the fix with the proper commit message (arcanist botched it badly), but it doesn't look like I have permission:

awilcox on gwyn [pts/16 Sun 16 11:23] labplot: git push -u origin master
git@git.kde.org: Permission denied (publickey).
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
Closed by commit R262:6699907157c7: Finish fixing build when Origin is disabled. (authored by awilcox, committed by asemke). · Explain WhySep 16 2018, 7:08 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 41494

View Options

src/kdefrontend/datasources/ImportProjectDialog.cpp

Loading...
View Options

tests/import_export/project/ProjectImportTest.h

Loading...
View Options

tests/import_export/project/ProjectImportTest.cpp

Loading...