luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unique library named to avoid name conflicts 

The libraries generated are called libklayout_x now
(instead of libx). This avoid name conflicts with
"libdb.so" on some systems for example.
This commit is contained in:
Matthias Koefferlein 2017-03-31 00:23:12 +02:00
parent e35e9fe8f7
commit 47aa38421a
19 changed files with 73 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ant/ant.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_ant
include($$PWD/../klayout.pri)
@ -38,5 +39,5 @@ SOURCES = \
INCLUDEPATH += ../tl ../gsi ../laybasic ../db
DEPENDPATH += ../tl ../gsi ../laybasic ../db
LIBS += -L$$DESTDIR -ltl -lgsi -llaybasic -ldb
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_db

5
src/db/db.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_db
include($$PWD/../klayout.pri)
@ -231,5 +232,5 @@ HEADERS = \
INCLUDEPATH += ../tl ../gsi
DEPENDPATH += ../tl ../gsi
LIBS += -L$$DESTDIR -ltl -lgsi
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi

5
src/edt/edt.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_edt
include($$PWD/../klayout.pri)
@ -67,5 +68,5 @@ DEPENDPATH += ../tl ../gsi ../laybasic ../db
INCLUDEPATH += $$DESTDIR/laybasic
DEPENDPATH += $$DESTDIR/laybasic
LIBS += -L$$DESTDIR -ltl -lgsi -llaybasic -ldb
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_db

5
src/ext/ext.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_ext
include($$PWD/../klayout.pri)
@ -79,5 +80,5 @@ DEPENDPATH += ../tl ../gsi ../laybasic ../lay ../db ../rdb ../ant ../edt
INCLUDEPATH += $$DESTDIR/laybasic $$OUT_PWD/../lay
DEPENDPATH += $$DESTDIR/laybasic $$OUT_PWD/../lay
LIBS += -L$$DESTDIR -ltl -lgsi -llaybasic -ldb -lrdb -llay -lant -ledt
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_db -lklayout_rdb -lklayout_lay -lklayout_ant -lklayout_edt

5
src/gsi/gsi.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_gsi
include($$PWD/../klayout.pri)
@ -50,5 +51,5 @@ SOURCES += gsiDeclTl.cc
INCLUDEPATH += ../tl
DEPENDPATH += ../tl
LIBS += -L$$DESTDIR -ltl
LIBS += -L$$DESTDIR -lklayout_tl

5
src/gsiqt/gsiqt.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_gsiqt
include($$PWD/../klayout.pri)
@ -11,7 +12,7 @@ TEMPLATE = lib
INCLUDEPATH += ../tl ../gsi ../db ../gsiqt
DEPENDPATH += ../tl ../gsi ../db ../gsiqt
LIBS += -L$$DESTDIR -ltl -lgsi -ldb
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db
SOURCES += \
gsiQt.cc \

5
src/img/img.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_img
include($$PWD/../klayout.pri)
@ -36,5 +37,5 @@ SOURCES = \
INCLUDEPATH += ../tl ../gsi ../laybasic ../db
DEPENDPATH += ../tl ../gsi ../laybasic ../db
LIBS += -L$$DESTDIR -ltl -lgsi -llaybasic -ldb
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_db

14
src/klayout_main/klayout_main.pro
View File

@ -1,5 +1,5 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
include($$PWD/../klayout.pri)
@ -18,7 +18,7 @@ RESOURCES = \
INCLUDEPATH += ../tl ../gsi ../db ../rdb ../laybasic ../lay ../ext ../img ../ant ../lib
DEPENDPATH += ../tl ../gsi ../db ../rdb ../laybasic ../lay ../ext ../img ../ant ../lib
LIBS += $$PYTHONLIBFILE $$RUBYLIBFILE -L$$DESTDIR -ltl -lgsi -ldb -lrdb -llaybasic -llay -lant -limg -ledt -lext -llib
LIBS += $$PYTHONLIBFILE $$RUBYLIBFILE -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -lklayout_laybasic -lklayout_lay -lklayout_ant -lklayout_img -lklayout_edt -lklayout_ext -lklayout_lib
# Note: this accounts for UI-generated headers placed into the output folders in
# shadow builds:
@ -28,25 +28,25 @@ DEPENDPATH += $$DESTDIR/laybasic $$OUT_PWD/../lay
equals(HAVE_QTBINDINGS, "1") {
INCLUDEPATH += ../gsiqt
DEPENDPATH += ../gsiqt
LIBS += -lgsiqt
LIBS += -lklayout_gsiqt
}
equals(HAVE_RUBY, "1") {
INCLUDEPATH += ../rba
DEPENDPATH += ../rba
LIBS += -lrba
LIBS += -lklayout_rba
} else {
INCLUDEPATH += ../rbastub
DEPENDPATH += ../rbastub
LIBS += -lrbastub
LIBS += -lklayout_rbastub
}
equals(HAVE_PYTHON, "1") {
INCLUDEPATH += ../pya
DEPENDPATH += ../pya
LIBS += -lpya
LIBS += -lklayout_pya
} else {
INCLUDEPATH += ../pyastub
DEPENDPATH += ../pyastub
LIBS += -lpyastub
LIBS += -lklayout_pyastub
}

15
src/lay/lay.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_lay
include($$PWD/../klayout.pri)
@ -143,7 +144,7 @@ RESOURCES = layBuildInMacros.qrc \
INCLUDEPATH += ../tl ../gsi ../db ../rdb ../laybasic ../ant ../img ../edt
DEPENDPATH += ../tl ../gsi ../db ../rdb ../laybasic ../ant ../img ../edt
LIBS += -L$$DESTDIR -ltl -lgsi -ldb -lrdb -llaybasic -lant -limg -ledt
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -lklayout_laybasic -lklayout_ant -lklayout_img -lklayout_edt
win32 {
# for stack trace support:
@ -161,26 +162,26 @@ INCLUDEPATH += ../gsiqt
DEPENDPATH += ../gsiqt
equals(HAVE_QTBINDINGS, "1") {
LIBS += -lgsiqt
LIBS += -lklayout_gsiqt
}
equals(HAVE_RUBY, "1") {
INCLUDEPATH += ../rba
DEPENDPATH += ../rba
LIBS += -lrba
LIBS += -lklayout_rba
} else {
INCLUDEPATH += ../rbastub
DEPENDPATH += ../rbastub
LIBS += -lrbastub
LIBS += -lklayout_rbastub
}
equals(HAVE_PYTHON, "1") {
INCLUDEPATH += ../pya
DEPENDPATH += ../pya
LIBS += -lpya
LIBS += -lklayout_pya
} else {
INCLUDEPATH += ../pyastub
DEPENDPATH += ../pyastub
LIBS += -lpyastub
LIBS += -lklayout_pyastub
}

7
src/laybasic/laybasic.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_laybasic
include($$PWD/../klayout.pri)
@ -275,12 +276,12 @@ HEADERS = \
INCLUDEPATH += ../tl ../gsi ../db ../rdb
DEPENDPATH += ../tl ../gsi ../db ../rdb
LIBS += -L$$DESTDIR -ltl -lgsi -ldb -lrdb
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb
INCLUDEPATH += ../gsiqt
DEPENDPATH += ../gsiqt
equals(HAVE_QTBINDINGS, "1") {
LIBS += -lgsiqt
LIBS += -lklayout_gsiqt
}

5
src/lib/lib.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_lib
include($$PWD/../klayout.pri)
@ -37,5 +38,5 @@ RESOURCES = \
INCLUDEPATH += ../gsi ../tl ../db
DEPENDPATH += ../gsi ../tl ../db
LIBS += -L$$DESTDIR -lgsi -ltl -ldb
LIBS += -L$$DESTDIR -lklayout_gsi -lklayout_tl -lklayout_db

5
src/pya/pya.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_pya
include($$PWD/../klayout.pri)
@ -19,7 +20,7 @@ SOURCES = \
INCLUDEPATH += $$PYTHONINCLUDE ../tl ../gsi
DEPENDPATH += $$PYTHONINCLUDE ../tl ../gsi
LIBS += $$PYTHONLIBFILE -L$$DESTDIR -ltl -lgsi
LIBS += $$PYTHONLIBFILE -L$$DESTDIR -lklayout_tl -lklayout_gsi
# Python is somewhat sloppy and relies on the compiler initializing fields
# of strucs to 0:

5
src/pyastub/pyastub.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_pyastub
include($$PWD/../klayout.pri)
@ -11,7 +12,7 @@ SOURCES = pya.cc
INCLUDEPATH += ../tl ../gsi
DEPENDPATH += ../tl ../gsi
LIBS += -L$$DESTDIR -ltl -lgsi
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi
HEADERS += \
pyaCommon.h

5
src/rba/rba.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_rba
include($$PWD/../klayout.pri)
@ -17,7 +18,7 @@ SOURCES = rba.cc \
# NOTE: ../common needs to be before RUBYINCLUDE since there is a config.h too.
INCLUDEPATH += ../common $$RUBYINCLUDE $$RUBYINCLUDE2 ../tl ../gsi
DEPENDPATH += ../common $$RUBYINCLUDE $$RUBYINCLUDE2 ../tl ../gsi
LIBS += $$RUBYLIBFILE -L$$DESTDIR -ltl -lgsi
LIBS += $$RUBYLIBFILE -L$$DESTDIR -lklayout_tl -lklayout_gsi
HEADERS += \

5
src/rbastub/rbastub.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_rbastub
include($$PWD/../klayout.pri)
@ -13,5 +14,5 @@ SOURCES = rba.cc
INCLUDEPATH += ../tl ../gsi
DEPENDPATH += ../tl ../gsi
LIBS += -L$$DESTDIR -ltl -lgsi
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi

5
src/rdb/rdb.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_rdb
include($$PWD/../klayout.pri)
@ -29,5 +30,5 @@ HEADERS = \
INCLUDEPATH += ../tl ../gsi ../db
DEPENDPATH += ../tl ../gsi ../db
LIBS += -L$$DESTDIR -ltl -lgsi -ldb
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db

3
src/tl/tl.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_tl
include($$PWD/../klayout.pri)

12
src/unit_tests.pri
View File

@ -2,7 +2,7 @@
INCLUDEPATH += $$PYTHONINCLUDE $$PWD/tl $$PWD/gsi $$PWD/db $$PWD/rdb $$PWD/laybasic $$PWD/lay $$PWD/ant $$PWD/img $$PWD/edt $$PWD/ext $$PWD/lib $$PWD/common $$PWD/ut
DEPENDPATH += $$PYTHONINCLUDE $$PWD/tl $$PWD/gsi $$PWD/db $$PWD/rdb $$PWD/laybasic $$PWD/lay $$PWD/ant $$PWD/img $$PWD/edt $$PWD/ext $$PWD/lib $$PWD/commo $$PWD/ut
LIBS += $$PYTHONLIBFILE $$RUBYLIBFILE -L$$DESTDIR -ltl -lgsi -ldb -lrdb -llaybasic -llay -lant -limg -ledt -lext -llib -lut
LIBS += $$PYTHONLIBFILE $$RUBYLIBFILE -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -lklayout_laybasic -lklayout_lay -lklayout_ant -lklayout_img -lklayout_edt -lklayout_ext -lklayout_lib -lklayout_ut
# Note: this accounts for UI-generated headers placed into the output folders in
# shadow builds:
@ -12,25 +12,25 @@ DEPENDPATH += $$DESTDIR/laybasic $$DESTDIR/lay $$DESTDIR/ext
equals(HAVE_QTBINDINGS, "1") {
INCLUDEPATH += $$PWD/gsiqt
DEPENDPATH += $$PWD/gsiqt
LIBS += -lgsiqt
LIBS += -lklayout_gsiqt
}
equals(HAVE_RUBY, "1") {
INCLUDEPATH += $$PWD/rba
DEPENDPATH += $$PWD/rba
LIBS += -lrba
LIBS += -lklayout_rba
} else {
INCLUDEPATH += $$PWD/rbastub
DEPENDPATH += $$PWD/rbastub
LIBS += -lrbastub
LIBS += -lklayout_rbastub
}
equals(HAVE_PYTHON, "1") {
INCLUDEPATH += $$PWD/pya
DEPENDPATH += $$PWD/pya
LIBS += -lpya
LIBS += -lklayout_pya
} else {
INCLUDEPATH += $$PWD/pyastub
DEPENDPATH += $$PWD/pyastub
LIBS += -lpyastub
LIBS += -lklayout_pyastub
}

13
src/ut/ut.pro
View File

@ -1,5 +1,6 @@
DESTDIR=$$OUT_PWD/..
DESTDIR = $$OUT_PWD/..
TARGET = klayout_ut
include($$PWD/../klayout.pri)
@ -18,25 +19,25 @@ SOURCES = \
INCLUDEPATH = ../tl ../db ../gsi ../lay ../ext ../lib
DEPENDPATH = ../tl ../db ../gsi ../lay ../ext ../lib
LIBS += -L$$DESTDIR -ltl -ldb -lgsi -llay -lext -llib
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_lay -lklayout_ext -lklayout_lib
equals(HAVE_RUBY, "1") {
INCLUDEPATH += ../rba
DEPENDPATH += ../rba
LIBS += -lrba
LIBS += -lklayout_rba
} else {
INCLUDEPATH += ../rbastub
DEPENDPATH += ../rbastub
LIBS += -lrbastub
LIBS += -lklayout_rbastub
}
equals(HAVE_PYTHON, "1") {
INCLUDEPATH += ../pya
DEPENDPATH += ../pya
LIBS += -lpya
LIBS += -lklayout_pya
} else {
INCLUDEPATH += ../pyastub
DEPENDPATH += ../pyastub
LIBS += -lpyastub
LIBS += -lklayout_pyastub
}