[Marble-devel] Review Request 111769: switch from qt4_automoc to cmake automoc

[Michael Zanetti]

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

(Updated Aug. 4, 2013, 2:32 p.m.)


Review request for Marble.


Changes
-------

This updated patch uses qt4_automoc for cmake versions < 2.8 and cmake's automoc for newer versions.

This should keep compatibility to Maemo (or other platforms where only older cmake versions are available) while opening up the way for the Qt5 port.

Downside of this is, that currently we need to use both macros:

marble_qt4_automoc( ${SRCS} )
and
marble_cmake_automoc( ${TARGET} )

Depending on the cmake version, only one of the macros actually does something.


Description
-------

This commit switches from qt4_automoc to cmake automoc.

This is one more step on the way to make Marble work with Qt5.


Diffs (updated)
-----

  MarbleMacros.cmake 5a0aedc 
  src/CMakeLists.txt b2a3e09 
  src/lib/CMakeLists.txt 16c7fab 
  src/plugins/declarative/CMakeLists.txt 300ebed 
  src/plugins/positionprovider/geoclue/GeoCute/CMakeLists.txt abde4f2 
  src/plugins/render/aprs/CMakeLists.txt 4896a8e 
  src/plugins/render/earthquake/CMakeLists.txt 6a4704e 
  src/plugins/render/elevationprofilefloatitem/CMakeLists.txt 872e5e1 
  src/plugins/render/elevationprofilemarker/CMakeLists.txt bbe043e 
  src/plugins/render/fileview/CMakeLists.txt adfa961 
  src/plugins/render/foursquare/CMakeLists.txt 0b62efd 
  src/plugins/render/license/CMakeLists.txt 90c0097 
  src/plugins/render/navigation/CMakeLists.txt b0597aa 
  src/plugins/render/opendesktop/CMakeLists.txt 50da329 
  src/qt-components/marble-touch/CMakeLists.txt 52940a6 
  src/routing-instructions/CMakeLists.txt c1e6386 
  src/tilecreator/CMakeLists.txt f1eed44 
  tools/tilecreator-srtm2/CMakeLists.txt 8088187 

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


Testing
-------

Tested on Ubuntu with Qt4 and -DQTONLY=1


Thanks,

Michael Zanetti

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20130804/81973c91/attachment.html>