diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-12-01 16:07:23 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-12-02 08:51:31 -0800 |
| commit | bb12dea03c81ca3a47491b4c85a9b0803c9ba278 (patch) | |
| tree | 5c8357e5f03e21117aece34cd6bc46ab95fcf058 | |
| parent | 60f09bbd4283b33f0aab8e0f600352ec78204cbb (diff) | |
| download | subsurface-bb12dea03c81ca3a47491b4c85a9b0803c9ba278.tar.gz | |
Allow LIBDCDEVEL to specify a path
That's something I had wanted to fix so many times...
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | subsurface-configure.pri | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/subsurface-configure.pri b/subsurface-configure.pri index b147eba21..f8789b182 100644 --- a/subsurface-configure.pri +++ b/subsurface-configure.pri @@ -53,11 +53,16 @@ PKG_CONFIG_OUT = $$system($$PKG_CONFIG --version 2> $$NUL) # # Find libdivecomputer # -!isEmpty(LIBDCDEVEL) { +equals(LIBDCDEVEL, "1") { # find it next to our sources INCLUDEPATH += ../libdivecomputer/include $$OUT_PWD/../libdivecomputer/include LIBS += ../libdivecomputer/src/.libs/libdivecomputer.a LIBDC_LA = ../libdivecomputer/src/libdivecomputer.la +} else:!isEmpty(LIBDCDEVEL) { + # find it next to our sources + INCLUDEPATH += $$LIBDCDEVEL/include $$OUT_PWD/$$LIBDCDEVEL/include + LIBS += $$LIBDCDEVEL/src/.libs/libdivecomputer.a + LIBDC_LA = $$LIBDCDEVEL/src/libdivecomputer.la } else:!isEmpty(CROSS_PATH):exists($${CROSS_PATH}"/lib/libdivecomputer.a"):exists($${CROSS_PATH}"/lib/libusb-1.0.a") { LIBS += $${CROSS_PATH}"/lib/libdivecomputer.a" $${CROSS_PATH}"/lib/libusb-1.0.a" } else:exists(/usr/local/lib/libdivecomputer.a) { |