summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Thiago Macieira <thiago@macieira.org>2014-02-01 18:52:06 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-02-02 07:03:50 -0800
commit9060558a7da73af9edf2f519e24c2ffe0259cde0 (patch)
tree2f1f3ddeebdf490d21feba44e987dba43494a637
parent2f582f4fb19e847fcde0f7962f0682aa7cbbe327 (diff)
downloadsubsurface-9060558a7da73af9edf2f519e24c2ffe0259cde0.tar.gz
Fix the LIBDCDEVEL=1 build when libdivecomputer was shadow-built
When that happens, the include/version.h file is in the shadow build dir, not in the sources. Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--subsurface-configure.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/subsurface-configure.pri b/subsurface-configure.pri
index b61ff4275..2df831d31 100644
--- a/subsurface-configure.pri
+++ b/subsurface-configure.pri
@@ -55,7 +55,7 @@ PKG_CONFIG_OUT = $$system($$PKG_CONFIG --version 2> $$NUL)
#
!isEmpty(LIBDCDEVEL) {
# find it next to our sources
- INCLUDEPATH += ../libdivecomputer/include
+ INCLUDEPATH += ../libdivecomputer/include $$OUT_PWD/../libdivecomputer/include
LIBS += ../libdivecomputer/src/.libs/libdivecomputer.a
LIBDC_LA = ../libdivecomputer/src/libdivecomputer.la
} else:!isEmpty(CROSS_PATH):exists($${CROSS_PATH}"/lib/libdivecomputer.a"):exists($${CROSS_PATH}"/lib/libusb-1.0.a") {