[PATCH] Fix the LIBDCDEVEL=1 build when libdivecomputer was shadow-built

Thiago Macieira thiago at macieira.org
Sat Feb 1 18:52:06 UTC 2014


When that happens, the include/version.h file is in the shadow build
dir, not in the sources.

Signed-off-by: Thiago Macieira <thiago at macieira.org>
---
 subsurface-configure.pri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subsurface-configure.pri b/subsurface-configure.pri
index b61ff42..2df831d 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") {
-- 
1.8.4.5



More information about the subsurface mailing list