D15461: Finish fixing build when Origin is disabled

A. Wilcox noreply at phabricator.kde.org
Wed Sep 12 18:24:01 BST 2018


awilcox created this revision.
Herald added a project: KDE Edu.
Herald added a subscriber: kde-edu.
awilcox requested review of this revision.

REVISION 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 at 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.

REPOSITORY
  R262 LabPlot

BRANCH
  master

REVISION DETAIL
  https://phabricator.kde.org/D15461

AFFECTED FILES
  src/kdefrontend/datasources/ImportProjectDialog.cpp
  tests/import_export/project/ProjectImportTest.cpp
  tests/import_export/project/ProjectImportTest.h

To: awilcox
Cc: kde-edu, narvaez, apol
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-edu/attachments/20180912/26a55a94/attachment.html>


More information about the kde-edu mailing list