[Marble-devel] Review Request: make tests compilable also when compiling with kdelibs

[Dennis Nienhüser]

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

Ship it!


Patch looks great, please commit.

- Dennis Nienhüser


On Nov. 26, 2012, 1:01 p.m., Pino Toscano wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/107474/
> -----------------------------------------------------------
> 
> (Updated Nov. 26, 2012, 1:01 p.m.)
> 
> 
> Review request for Marble.
> 
> 
> Description
> -------
> 
> Currently, tests are disable if not compiling in QTONLY mode, making testing more difficult when compiling as KDE application.
> 
> The patch makes it possible to compile (and possibly also run) tests when compiling with kdelibs:
> - set BUILD_MARBLE_TESTS according to KDE4_BUILD_TESTS
> - introduce a new marble_add_qtonly_test, similar to marble_add_test, to compile a test only in QTONLY mode
> - setup the kde4 include directories
> - define -DQT_GUI_LIB to make QtTest aware that they are gui tests
> - compile TestGeoSceneWriter and MercatorProjectionTest only in QTONLY mode, as they use internal classes (not exported, so unavailable when symbol visibility is used)
> 
> 
> Diffs
> -----
> 
>   CMakeLists.txt d9205a6529c16db54f88a12ecda2225244c92ed8 
>   MarbleMacros.cmake 5e1a1e56995eb5b9b3a64db803ab47e4838e00f1 
>   tests/CMakeLists.txt 55d78f26862b19066cdb7317fdd5d227cf13d248 
> 
> Diff: http://git.reviewboard.kde.org/r/107474/diff/
> 
> 
> Testing
> -------
> 
> marble and tests compile fine with and without -DQTONLY=ON.
> 
> 
> Thanks,
> 
> Pino Toscano
> 
>

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