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

Boudewijn Rempt boud at valdyas.org
Thu Dec 5 08:33:37 GMT 2013 


> On Dec. 5, 2013, 8:15 a.m., Boudewijn Rempt wrote:
> > Works fine on Linux as well. Only two things I'm concerned about:
> > 
> > * adding new 3rd party libraries: we shouldn't unless they are unlikely to be packaged by distributions. 
> > * adding a libary that will be used, but isn't yet -- but maybe I'm missing something here.

I spoke too soon. CMake ran without trouble, but a clean build failed:

...

  Generating writeodf.h^M
  'RNG2CCP_EXECUTABLE-NOTFOUND' is not recognized as an internal or external command,^M
  operable program or batch file.^M
C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V110\Microsoft.CppCommon.targets(172,5): error MSB6006: "cmd.exe" 

Build FAILED.^M
^M

...

"C:\dev\desktop64\p\vs11\INSTALL.vcxproj" (default target) (1) ->^M
"C:\dev\desktop64\p\vs11\ALL_BUILD.vcxproj" (default target) (2) ->^M
"C:\dev\desktop64\p\vs11\libs\basicflakes\basicflakes.vcxproj" (default target) (18) ->^M
"C:\dev\desktop64\p\vs11\libs\flake\flake.vcxproj" (default target) (20) ->^M
"C:\dev\desktop64\p\vs11\libs\odf\koodf.vcxproj" (default target) (22) ->^M
"C:\dev\desktop64\p\vs11\libs\odf\writeodf\writeodf.h-target.vcxproj" (default target) (24) ->^M
(CustomBuild target) -> ^M
  C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V110\Microsoft.CppCommon.targets(172,5): error MSB6006: "cmd.exe" exited with code 9009. [C:\dev\desktop64\p\vs11\libs\odf\writeodf\writeodf.h-target.vcxproj]^M
^M
    0 Warning(s)^M
    1 Error(s)^M
^M
Time Elapsed 00:00:11.03^M


Though that might be Xiluembo's earlier commit, not a problem in this branch. Is master fully merged?


- Boudewijn


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


On Dec. 4, 2013, 6:09 p.m., Yue Liu wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/114193/
> -----------------------------------------------------------
> 
> (Updated Dec. 4, 2013, 6:09 p.m.)
> 
> 
> 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: http://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/20131205/fcc1fc6e/attachment.htm>

More information about the calligra-devel mailing list