# HG changeset patch # User Alexis Jeandet # Date 2015-06-18 12:00:10 # Node ID 79b3f038ed29b39fb692d3b9b24e01674c095e10 # Parent f3cd68e05582f171d5eca415353728ebd233b7f7 Fixed some builds issues diff --git a/qilib/.qmake.conf b/qilib/.qmake.conf new file mode 100644 --- /dev/null +++ b/qilib/.qmake.conf @@ -0,0 +1,2 @@ +top_srcdir=$$PWD +top_builddir=$$shadowed($$PWD) diff --git a/qilib/qilib.pro b/qilib/qilib.pro --- a/qilib/qilib.pro +++ b/qilib/qilib.pro @@ -46,7 +46,7 @@ qilibParsersHeaders.files = \ INSTALLS += target qilibHeaders qilibParsersHeaders qilibcfg -INCLUDEPATH += ./parsers +INCLUDEPATH += ./qilib/lispLike ./parsers SOURCES += \ qicadnetlist.cpp \ diff --git a/test/PCBView/.qmake.conf b/test/PCBView/.qmake.conf new file mode 100644 --- /dev/null +++ b/test/PCBView/.qmake.conf @@ -0,0 +1,2 @@ +top_srcdir=$$PWD +top_builddir=$$shadowed($$PWD) diff --git a/test/PCBView/PCBView.pro b/test/PCBView/PCBView.pro --- a/test/PCBView/PCBView.pro +++ b/test/PCBView/PCBView.pro @@ -17,7 +17,7 @@ RCC_DIR = resources OBJECTS_DIR = obj DESTDIR = ../../bin -INCLUDEPATH += ../../qilib $${DESTDIR}/../qilib/ +INCLUDEPATH += ../../qilib $${DESTDIR}/../qilib/ $${DESTDIR}/../qilib/lispLike/ LIBS += -L../../bin -lQIlib diff --git a/test/dumpLispLikeFiles/.qmake.conf b/test/dumpLispLikeFiles/.qmake.conf new file mode 100644 --- /dev/null +++ b/test/dumpLispLikeFiles/.qmake.conf @@ -0,0 +1,2 @@ +top_srcdir=$$PWD +top_builddir=$$shadowed($$PWD) diff --git a/test/dumpLispLikeFiles/dumpLispLikeFiles.pro b/test/dumpLispLikeFiles/dumpLispLikeFiles.pro --- a/test/dumpLispLikeFiles/dumpLispLikeFiles.pro +++ b/test/dumpLispLikeFiles/dumpLispLikeFiles.pro @@ -12,7 +12,11 @@ DESTDIR = ../../bin SOURCES += main.cpp -INCLUDEPATH += ../../qilib $${DESTDIR}/../qilib/ +INCLUDEPATH += ../../bin/../../qilib \ + ../../qilib + +message("top_builddir" $$top_builddir) +message("top_srcdir" $$top_srcdir) LIBS += -L../../bin -lQIlib