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

[consider merging] Functional ut_runner binary also with -without-qt

This commit is contained in:
Matthias Koefferlein 2023-10-28 23:48:56 +02:00
parent ba19b3374a
commit b56220d36d
6 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/db/db/db.pro
View File

@ -404,7 +404,7 @@ HEADERS = \
dbShapeCollection.h \ dbShapeCollection.h \
dbShapeCollectionUtils.h dbShapeCollectionUtils.h
!equals(HAVE_QT, "0") || !equals(HAVE_PYTHON, "0") { !equals(HAVE_QT, "0") {
RESOURCES = \ RESOURCES = \
dbResources.qrc \ dbResources.qrc \

2
src/drc/drc/drc.pro
View File

@ -13,7 +13,7 @@ HEADERS = \
drcCommon.h \ drcCommon.h \
drcForceLink.h \ drcForceLink.h \
!equals(HAVE_QT, "0") || !equals(HAVE_PYTHON, "0") { !equals(HAVE_QT, "0") {
RESOURCES = \ RESOURCES = \
drcResources.qrc drcResources.qrc
} }

82
src/lib/lib/lib.pro
View File

@ -1,40 +1,42 @@
DESTDIR = $$OUT_PWD/../.. DESTDIR = $$OUT_PWD/../..
TARGET = klayout_lib TARGET = klayout_lib
include($$PWD/../../lib.pri) include($$PWD/../../lib.pri)
DEFINES += MAKE_LIB_LIBRARY DEFINES += MAKE_LIB_LIBRARY
HEADERS = \ HEADERS = \
libBasicArc.h \ libBasicArc.h \
libBasicCircle.h \ libBasicCircle.h \
libBasicDonut.h \ libBasicDonut.h \
libBasicEllipse.h \ libBasicEllipse.h \
libBasicPie.h \ libBasicPie.h \
libBasicRoundPath.h \ libBasicRoundPath.h \
libBasicRoundPolygon.h \ libBasicRoundPolygon.h \
libBasicStrokedPolygon.h \ libBasicStrokedPolygon.h \
libBasicText.h \ libBasicText.h \
libForceLink.h libForceLink.h
SOURCES = \ SOURCES = \
libForceLink.cc \ libForceLink.cc \
libBasic.cc \ libBasic.cc \
libBasicArc.cc \ libBasicArc.cc \
libBasicCircle.cc \ libBasicCircle.cc \
libBasicDonut.cc \ libBasicDonut.cc \
libBasicEllipse.cc \ libBasicEllipse.cc \
libBasicPie.cc \ libBasicPie.cc \
libBasicRoundPath.cc \ libBasicRoundPath.cc \
libBasicRoundPolygon.cc \ libBasicRoundPolygon.cc \
libBasicStrokedPolygon.cc \ libBasicStrokedPolygon.cc \
libBasicText.cc libBasicText.cc
RESOURCES = \ !equals(HAVE_QT, "0") {
libResources.qrc RESOURCES = \
libResources.qrc
INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC }
DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC
LIBS += -L$$DESTDIR -lklayout_gsi -lklayout_tl -lklayout_db INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC
DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC
LIBS += -L$$DESTDIR -lklayout_gsi -lklayout_tl -lklayout_db

2
src/lvs/lvs/lvs.pro
View File

@ -13,7 +13,7 @@ HEADERS = \
lvsCommon.h \ lvsCommon.h \
lvsForceLink.h \ lvsForceLink.h \
!equals(HAVE_QT, "0") || !equals(HAVE_PYTHON, "0") { !equals(HAVE_QT, "0") {
RESOURCES = \ RESOURCES = \
lvsResources.qrc lvsResources.qrc
} }

2
src/rba/unit_tests/unit_tests.pro
View File

@ -14,7 +14,7 @@ DEPENDPATH += $$RBA_INC $$TL_INC $$DB_INC $$GSI_INC
LIBS += -L$$DESTDIR_UT -lklayout_rba -lklayout_tl -lklayout_db -lklayout_gsi LIBS += -L$$DESTDIR_UT -lklayout_rba -lklayout_tl -lklayout_db -lklayout_gsi
!equals(HAVE_QT, "0") || !equals(HAVE_PYTHON, "0") { !equals(HAVE_QT, "0") {
RESOURCES = \ RESOURCES = \
rba_unit_tests.qrc rba_unit_tests.qrc
} }

4
src/unit_tests/unit_test_main.cc
View File

@ -433,6 +433,8 @@ run_tests (const std::vector<tl::TestBase *> &selected_tests, bool editable, boo
static int static int
main_cont (int &argc, char **argv) main_cont (int &argc, char **argv)
{ {
ut::TestConsole console (stdout);
std::unique_ptr<rba::RubyInterpreter> ruby_interpreter; std::unique_ptr<rba::RubyInterpreter> ruby_interpreter;
std::unique_ptr<pya::PythonInterpreter> python_interpreter; std::unique_ptr<pya::PythonInterpreter> python_interpreter;
@ -452,8 +454,6 @@ main_cont (int &argc, char **argv)
int result = 0; int result = 0;
ut::TestConsole console (stdout);
try { try {
pya::PythonInterpreter::initialize (); pya::PythonInterpreter::initialize ();