Some more fixes for Linux builds

This commit is contained in:
Matthias Koefferlein 2019-05-21 21:05:38 +02:00
parent 0b8fa69551
commit abc3d38ba4
2 changed files with 6 additions and 5 deletions

View File

@ -19,7 +19,7 @@ SOURCES = $$PWD/bd/main.cc
INCLUDEPATH += $$BD_INC $$TL_INC $$GSI_INC INCLUDEPATH += $$BD_INC $$TL_INC $$GSI_INC
DEPENDPATH += $$BD_INC $$TL_INC $$GSI_INC DEPENDPATH += $$BD_INC $$TL_INC $$GSI_INC
LIBS += -L$$DESTDIR -lklayout_bd -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_lib -lklayout_rdb LIBS += -L$$DESTDIR -lklayout_bd -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_lib -lklayout_rdb -lklayout_lym
INCLUDEPATH += $$RBA_INC INCLUDEPATH += $$RBA_INC
DEPENDPATH += $$RBA_INC DEPENDPATH += $$RBA_INC

View File

@ -9,18 +9,18 @@ SUBDIRS = \
db \ db \
rdb \ rdb \
lib \ lib \
buddies \
plugins \ plugins \
unit_tests \ unit_tests \
!equals(HAVE_QT, "0") { !equals(HAVE_QT, "0") {
# TODO: make unit_tests capable of running without Qt # TODO: make buddies able to build without Qt
SUBDIRS += \ SUBDIRS += \
klayout_main \ klayout_main \
laybasic \ laybasic \
lay \ lay \
ant \ ant \
buddies \
lym \ lym \
img \ img \
edt \ edt \
@ -58,11 +58,12 @@ db.depends += gsi
rdb.depends += db rdb.depends += db
lib.depends += db lib.depends += db
plugins.depends += lib rdb lym db plugins.depends += lib rdb db
buddies.depends += plugins $$LANG_DEPENDS
!equals(HAVE_QT, "0") { !equals(HAVE_QT, "0") {
buddies.depends += plugins lym $$LANG_DEPENDS
equals(HAVE_PYTHON, "1") { equals(HAVE_PYTHON, "1") {
pymod.depends += lay pymod.depends += lay
} }