[Marble-devel] Review Request: Fix automagic dependencies in Marble
Dennis Nienhüser
earthwings at gentoo.org
Mon Jul 16 20:42:56 UTC 2012
> On July 16, 2012, 8:27 p.m., Dennis Nienhüser wrote:
> > The patch does not work when the QTONLY=TRUE option is enabled (i.e. Marble is built without KDE), because the macro_optional_find_package is a KDE cmake macro. We'd need to copy it to our cmake macros or provide a similar macro for the patch to work in all cases.
> >
> > $ grep QTONLY CMakeCache.txt
> > QTONLY:BOOL=TRUE
> > $ cmake ../src
> > CMake Error at src/plugins/positionprovider/CMakeLists.txt:3 (macro_optional_find_package):
> > Unknown CMake command "macro_optional_find_package".
> > -- Configuring incomplete, errors occurred!
> >
>
> Michael Palimaka wrote:
> Good point. Any objection to copying the macro then?
>
> If adding another macro is not desired, another option could be to do the work of the macro manually.
No, sounds fine (assuming it's not overly complex). Possibly needs a rename to avoid a clash when building the KDE version. The macro should fit well in MarbleMacros.cmake in the root directory.
- Dennis
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/105598/#review15984
-----------------------------------------------------------
On July 16, 2012, 7:49 p.m., Michael Palimaka wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/105598/
> -----------------------------------------------------------
>
> (Updated July 16, 2012, 7:49 p.m.)
>
>
> Review request for Marble.
>
>
> Description
> -------
>
> The dependencies required to build Marble plugins are currently automagic - there is no way for the end user to disable them if the dependency is present.
>
> This patch simply fixes that, adding new configure options -DWITH_{libgps,liblocation,QtLocation}.
>
>
> Diffs
> -----
>
> src/plugins/positionprovider/CMakeLists.txt 43e3b1373728553b634cf1c0ce7c078adcb8aad0
>
> Diff: http://git.reviewboard.kde.org/r/105598/diff/
>
>
> Testing
> -------
>
>
> Thanks,
>
> Michael Palimaka
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20120716/4943a4fe/attachment.html>
More information about the Marble-devel
mailing list