[Marble-devel] Review Request: Build the library as marblewidget.framework on OSX

[Kathrin Geilmann]

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

Review request for Marble.


Description
-------

This patch builds the marble library as an OSX Framework. It bundles libmarblewidget, headers, data files and plugins into marblewidget.framework, which gets installed at FRAMEWORK_INSTALL_DIR (/Library/Frameworks by default). 
The marble application bundle uses the framework. In order to make the framework find the data files and plugins, the pathmagick in MarbleDirs removed, it uses the osx functions for finding the resource paths of a bundle instead of hard coded paths.
Additionally a cmake warning about the bundle destination and Bug 299029 are fixed. 

The patch influences QTOnly builds on OSX.

Unfortunately I cannot test that the change to MarbleDirs does not break KDE builds on OSX. As far as I see it should result in exactly the same behavior as before, because I just replaced the path magick with standard osx functions. 

Sidenotes: - For deploying marble.app the framework should be included in the app bundle -> the procedure to build the dmg should be adapted accordingly.
- Using make install is mandatory, otherwise the datafiles and plugins are not copied into the framework. It would be nice to use the RESOURCE property for frameworks, but I couldn't figure out how to preserve the directory structure of the data directory. Using it, would allow to create the framework complete in the make step.


Diffs
-----

  CMakeLists.txt 388826cb86f5fd7c02e1237e3c315148f1feaccf 
  src/CMakeLists.txt b33ec4fdcad7e3c5d8c0c0262c9746361f12f26d 
  src/lib/CMakeLists.txt 27ac7eca50982cd1f61e7691ceed9095aa114da9 
  src/lib/MarbleDirs.h 0a52b96bdaaedbd84f4d35f441acb2ec7810ae2a 
  src/lib/MarbleDirs.cpp 3984fda4f1169ee74ed41c3b3848bec113a35a41 

Diff: http://git.reviewboard.kde.org/r/105315/diff/


Testing
-------

a) Tested on my development system: OSX 10.6.8, cmake 2.8.7, Qt 4.7.4, 64bit machine, QTONLY build
b) Ubuntu 04.12, cmake 2.8.7, Qt 4.8.1, KDE 4.8.3, (All installed from ubuntu packages), QTOnly and KDE builds. -> As expected no changes were found.


Thanks,

Kathrin Geilmann

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20120621/6b4d05ac/attachment.html>