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

[Lubomir I. Ivanov]

On 9 October 2013 22:45, Thiago Macieira <thiago at macieira.org> wrote:
> 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.
>

ok, understood,

TBH, i made up the libmarble.pc for pkg-config because it was more
suitable for just me.
other than that i think libraries like Marble should use pkg-config...

lubomir
--