[PATCH 5/5] subsurface-configure.pri: add an extra Marble detection stage

[Thiago Macieira]

On quarta-feira, 9 de outubro de 2013 21:35:52, Lubomir I. Ivanov wrote:
> From: "Lubomir I. Ivanov" <neolit123 at gmail.com>
> 
> On Linux, Marble install in /usr/include and we blindly use it when
> building. On Win32 there is no such thing as a marble folder unless
> we provide a location for it.
> 
> This patch adds an extra Marble detection stage with a pkg-config
> target named 'libmarble'.
> 
> Signed-off-by: Lubomir I. Ivanov <neolit123 at gmail.com>
> ---
>  subsurface-configure.pri | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/subsurface-configure.pri b/subsurface-configure.pri
> index 76d4472..cc3e463 100644
> --- a/subsurface-configure.pri
> +++ b/subsurface-configure.pri
> @@ -111,6 +111,11 @@ link_pkgconfig: packagesExist(libiconv): PKGCONFIG +=
> libiconv win32: CONFIG(debug, debug|release): LIBS += -lmarblewidgetd
>  else: LIBS += -lmarblewidget
> 
> +# If marble is not found try using pkg-config for it
> +!exists(/usr/include/marble/global.h) {
> +   link_pkgconfig: PKGCONFIG += libmarble
> +}
> +
>  #
>  # Platform-specific changes
>  #

-1

This will break the build for self-installed Marbles. 

I can't find a libmarble.pc on my system and I can't find anywhere in Marble's 
source code where it would create one.

For people with non-global Marbles, the correct procedure is to pass extra 
INCLUDEPATH and LIBS arguments to qmake, telling it where to find those files.

-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
   Software Architect - Intel Open Source Technology Center
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.hohndel.org/pipermail/subsurface/attachments/20131009/db7f32c0/attachment.sig>