[PATCH 5/5] subsurface-configure.pri: add an extra Marble detection stage
Lubomir I. Ivanov
neolit123 at gmail.com
Wed Oct 9 11:35:52 UTC 2013
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.7.11.msysgit.0
More information about the subsurface
mailing list