From b56220d36dd12a4a992d00a67f374b8fb26bead5 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@klayout.de>
Date: Sat, 28 Oct 2023 23:48:56 +0200
Subject: [PATCH] [consider merging] Functional ut_runner binary also with
 -without-qt

---
 src/db/db/db.pro                  |  2 +-
 src/drc/drc/drc.pro               |  2 +-
 src/lib/lib/lib.pro               | 82 ++++++++++++++++---------------
 src/lvs/lvs/lvs.pro               |  2 +-
 src/rba/unit_tests/unit_tests.pro |  2 +-
 src/unit_tests/unit_test_main.cc  |  4 +-
 6 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/src/db/db/db.pro b/src/db/db/db.pro
index 6914e12fa..513cca3a0 100644
--- a/src/db/db/db.pro
+++ b/src/db/db/db.pro
@@ -404,7 +404,7 @@ HEADERS = \
   dbShapeCollection.h \
   dbShapeCollectionUtils.h
 
-!equals(HAVE_QT, "0") || !equals(HAVE_PYTHON, "0") {
+!equals(HAVE_QT, "0") {
 
   RESOURCES = \
     dbResources.qrc \
diff --git a/src/drc/drc/drc.pro b/src/drc/drc/drc.pro
index c43e875d0..2304dc132 100644
--- a/src/drc/drc/drc.pro
+++ b/src/drc/drc/drc.pro
@@ -13,7 +13,7 @@ HEADERS = \
   drcCommon.h \
   drcForceLink.h \
 
-!equals(HAVE_QT, "0") || !equals(HAVE_PYTHON, "0") {
+!equals(HAVE_QT, "0") {
   RESOURCES = \
     drcResources.qrc
 }
diff --git a/src/lib/lib/lib.pro b/src/lib/lib/lib.pro
index 8352f19af..98f84bd54 100644
--- a/src/lib/lib/lib.pro
+++ b/src/lib/lib/lib.pro
@@ -1,40 +1,42 @@
-
-DESTDIR = $$OUT_PWD/../..
-TARGET = klayout_lib
-
-include($$PWD/../../lib.pri)
-
-DEFINES += MAKE_LIB_LIBRARY
-
-HEADERS = \
-  libBasicArc.h \
-  libBasicCircle.h \
-  libBasicDonut.h \
-  libBasicEllipse.h \
-  libBasicPie.h \
-  libBasicRoundPath.h \
-  libBasicRoundPolygon.h \
-  libBasicStrokedPolygon.h \
-  libBasicText.h \
-  libForceLink.h
-
-SOURCES = \
-  libForceLink.cc \
-  libBasic.cc \
-  libBasicArc.cc \
-  libBasicCircle.cc \
-  libBasicDonut.cc \
-  libBasicEllipse.cc \
-  libBasicPie.cc \
-  libBasicRoundPath.cc \
-  libBasicRoundPolygon.cc \
-  libBasicStrokedPolygon.cc \
-  libBasicText.cc
-
-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
-
+
+DESTDIR = $$OUT_PWD/../..
+TARGET = klayout_lib
+
+include($$PWD/../../lib.pri)
+
+DEFINES += MAKE_LIB_LIBRARY
+
+HEADERS = \
+  libBasicArc.h \
+  libBasicCircle.h \
+  libBasicDonut.h \
+  libBasicEllipse.h \
+  libBasicPie.h \
+  libBasicRoundPath.h \
+  libBasicRoundPolygon.h \
+  libBasicStrokedPolygon.h \
+  libBasicText.h \
+  libForceLink.h
+
+SOURCES = \
+  libForceLink.cc \
+  libBasic.cc \
+  libBasicArc.cc \
+  libBasicCircle.cc \
+  libBasicDonut.cc \
+  libBasicEllipse.cc \
+  libBasicPie.cc \
+  libBasicRoundPath.cc \
+  libBasicRoundPolygon.cc \
+  libBasicStrokedPolygon.cc \
+  libBasicText.cc
+
+!equals(HAVE_QT, "0") {
+  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
+
diff --git a/src/lvs/lvs/lvs.pro b/src/lvs/lvs/lvs.pro
index 5a8c53f27..722270f84 100644
--- a/src/lvs/lvs/lvs.pro
+++ b/src/lvs/lvs/lvs.pro
@@ -13,7 +13,7 @@ HEADERS = \
   lvsCommon.h \
   lvsForceLink.h \
 
-!equals(HAVE_QT, "0") || !equals(HAVE_PYTHON, "0") {
+!equals(HAVE_QT, "0") {
   RESOURCES = \
     lvsResources.qrc
 }
diff --git a/src/rba/unit_tests/unit_tests.pro b/src/rba/unit_tests/unit_tests.pro
index 6bca18f2f..5924ccae6 100644
--- a/src/rba/unit_tests/unit_tests.pro
+++ b/src/rba/unit_tests/unit_tests.pro
@@ -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
 
-!equals(HAVE_QT, "0") || !equals(HAVE_PYTHON, "0") {
+!equals(HAVE_QT, "0") {
   RESOURCES = \
     rba_unit_tests.qrc
 }
diff --git a/src/unit_tests/unit_test_main.cc b/src/unit_tests/unit_test_main.cc
index 75c8f7809..2837663bd 100644
--- a/src/unit_tests/unit_test_main.cc
+++ b/src/unit_tests/unit_test_main.cc
@@ -433,6 +433,8 @@ run_tests (const std::vector<tl::TestBase *> &selected_tests, bool editable, boo
 static int
 main_cont (int &argc, char **argv)
 {
+  ut::TestConsole console (stdout);
+
   std::unique_ptr<rba::RubyInterpreter> ruby_interpreter;
   std::unique_ptr<pya::PythonInterpreter> python_interpreter;
 
@@ -452,8 +454,6 @@ main_cont (int &argc, char **argv)
 
   int result = 0;
 
-  ut::TestConsole console (stdout);
-
   try {
 
     pya::PythonInterpreter::initialize ();