Review Request 114193: Added new cmake macros and find_package modules, added new dependency libodfgen, deleted writerperfect, use libodfgen instead

Yue Liu yue.liu at mail.com
Mon Jul 7 03:36:43 BST 2014


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/114193/
-----------------------------------------------------------

(Updated July 7, 2014, 2:36 a.m.)


Status
------

This change has been marked as submitted.


Review request for Calligra.


Repository: calligra


Description
-------

Use LibFindMacros.cmake to simplify package finding, fixed FindFFTW3, FindLIBWPD, FINDLIBWPG on mac, and some other mac fixes.
Added dependency libodfgen and future dependency libetonyek, deleteed writerperfet code.

To test the patch, just checkout branch cmake-fix-osx-yue


Diffs
-----

  CMakeLists.txt 6587ecc 
  cmake/modules/FindFFTW3.cmake a4c8997 
  cmake/modules/FindLibEtonyek.cmake PRE-CREATION 
  cmake/modules/FindLibOdfGen.cmake PRE-CREATION 
  cmake/modules/FindLibVisio.cmake 69a598a 
  cmake/modules/FindLibWPS.cmake e34f382 
  cmake/modules/FindLibWpd.cmake PRE-CREATION 
  cmake/modules/FindLibWpg.cmake PRE-CREATION 
  cmake/modules/FindLibWps.cmake PRE-CREATION 
  cmake/modules/FindWPD.cmake 0f666b3 
  cmake/modules/FindWPG.cmake 066e579 
  cmake/modules/LibFindMacros.cmake PRE-CREATION 
  filters/CMakeLists.txt ba04b83 
  filters/flow/CMakeLists.txt c37d395 
  filters/flow/visio/import/CMakeLists.txt 55b8488 
  filters/flow/visio/import/VSDXImport.h 712d9d7 
  filters/flow/visio/import/VSDXImport.cpp 788379e 
  filters/flow/wpg/CMakeLists.txt PRE-CREATION 
  filters/flow/wpg/import/CMakeLists.txt PRE-CREATION 
  filters/flow/wpg/import/WPGImport.h PRE-CREATION 
  filters/flow/wpg/import/WPGImport.cpp PRE-CREATION 
  filters/flow/wpg/import/calligra_filter_wpg2odg.desktop PRE-CREATION 
  filters/flow/wpg/import/flow_wpg_thumbnail.desktop PRE-CREATION 
  filters/karbon/wpg/CMakeLists.txt e8600a0 
  filters/libodfhandler/DiskDocumentHandler.hxx PRE-CREATION 
  filters/libodfhandler/DiskDocumentHandler.cxx PRE-CREATION 
  filters/libodfhandler/FemtoZip.hxx PRE-CREATION 
  filters/libodfhandler/FemtoZip.cxx PRE-CREATION 
  filters/libodfhandler/OutputFileHelper.hxx PRE-CREATION 
  filters/libodfhandler/OutputFileHelper.cxx PRE-CREATION 
  filters/libodfhandler/StdOutHandler.hxx PRE-CREATION 
  filters/libodfhandler/StdOutHandler.cxx PRE-CREATION 
  filters/words/wordperfect/import/CMakeLists.txt cbcf650 
  filters/words/wordperfect/import/WPDImport.h ad515f7 
  filters/words/wordperfect/import/WPDImport.cpp e3b2c2c 
  filters/words/works/import/CMakeLists.txt 082cb31 
  filters/words/works/import/WPSImport.h 2d1b20c 
  filters/words/works/import/WPSImport.cpp e52d5b5 
  filters/writerperfect/CMakeLists.txt 1f57075 
  filters/writerperfect/DiskDocumentHandler.hxx 7b37ea3 
  filters/writerperfect/DiskDocumentHandler.cxx 799fdd0 
  filters/writerperfect/DocumentElement.hxx 5a03977 
  filters/writerperfect/DocumentElement.cxx 47a9d7e 
  filters/writerperfect/FemtoZip.hxx afecf5e 
  filters/writerperfect/FemtoZip.cxx c52a707 
  filters/writerperfect/FilterInternal.hxx eb2ddf8 
  filters/writerperfect/FontStyle.hxx 379b9c1 
  filters/writerperfect/FontStyle.cxx 111b46d 
  filters/writerperfect/InternalHandler.hxx 9223f1f 
  filters/writerperfect/InternalHandler.cxx 6ad9142 
  filters/writerperfect/ListStyle.hxx 94b31f8 
  filters/writerperfect/ListStyle.cxx dab5058 
  filters/writerperfect/OdfDocumentHandler.hxx d2911a9 
  filters/writerperfect/OdgGenerator.hxx 7296935 
  filters/writerperfect/OdgGenerator.cxx 49a3ac3 
  filters/writerperfect/OdtGenerator.hxx 425143d 
  filters/writerperfect/OdtGenerator.cxx bbcdc5c 
  filters/writerperfect/OutputFileHelper.hxx 48023b1 
  filters/writerperfect/OutputFileHelper.cxx 22a1895 
  filters/writerperfect/PageSpan.hxx 64c7053 
  filters/writerperfect/PageSpan.cxx c64a1dd 
  filters/writerperfect/SectionStyle.hxx bb52a55 
  filters/writerperfect/SectionStyle.cxx 2e5d352 
  filters/writerperfect/StdOutHandler.hxx de5d402 
  filters/writerperfect/StdOutHandler.cxx f8175f2 
  filters/writerperfect/Style.hxx 2682b24 
  filters/writerperfect/TableStyle.hxx bcd45a5 
  filters/writerperfect/TableStyle.cxx 1b99b6e 
  filters/writerperfect/TextRunStyle.hxx 63c297d 
  filters/writerperfect/TextRunStyle.cxx e34b2dd 
  filters/writerperfect/WriterProperties.hxx 8b61b65 
  krita/image/CMakeLists.txt da1102c 
  krita/image/kis_assert.cpp 17a85f8 
  krita/plugins/extensions/gmic/CMakeLists.txt 15291af 
  libs/main/KoDocument.cpp 0a17961 
  libs/widgets/KoEditColorSetDialog.cpp d683bcc 

Diff: https://git.reviewboard.kde.org/r/114193/diff/


Testing
-------

Works on OSX 10.9, and Arch Linux. Please check if the FindXXX changes work on windows.


Thanks,

Yue Liu

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/calligra-devel/attachments/20140707/0d95fcef/attachment.htm>


More information about the calligra-devel mailing list