mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow LIBDCDEVEL to specify a path

Browse source 
That's something I had wanted to fix so many times...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-12-01 16:07:23 -08:00
parent 60f09bbd42
commit bb12dea03c
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
subsurface-configure.pri
View file

@ -53,11 +53,16 @@ PKG_CONFIG_OUT = $$system($$PKG_CONFIG --version 2> $$NUL)
# #
# Find libdivecomputer # Find libdivecomputer
# #
!isEmpty(LIBDCDEVEL) { equals(LIBDCDEVEL, "1") {
# find it next to our sources # find it next to our sources
INCLUDEPATH += ../libdivecomputer/include $$OUT_PWD/../libdivecomputer/include INCLUDEPATH += ../libdivecomputer/include $$OUT_PWD/../libdivecomputer/include
LIBS += ../libdivecomputer/src/.libs/libdivecomputer.a LIBS += ../libdivecomputer/src/.libs/libdivecomputer.a
LIBDC_LA = ../libdivecomputer/src/libdivecomputer.la 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") { } 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" LIBS += $${CROSS_PATH}"/lib/libdivecomputer.a" $${CROSS_PATH}"/lib/libusb-1.0.a"
} else:exists(/usr/local/lib/libdivecomputer.a) { } else:exists(/usr/local/lib/libdivecomputer.a) {