From 6aa66830e8c1ed7d433b6487f17703f8bfcc9b7d Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@klayout.de>
Date: Sat, 8 Nov 2025 10:24:10 +0100
Subject: [PATCH] Trying to fix builds

---
 src/plugins/streamers/lstream/db_plugin/db_plugin.pro   | 2 +-
 src/plugins/streamers/lstream/lay_plugin/lay_plugin.pro | 2 +-
 src/plugins/streamers/lstream/lstream.pri               | 2 ++
 src/plugins/streamers/lstream/runtime/capnp/capnp.pro   | 2 +-
 src/plugins/streamers/lstream/runtime/kj/kj.pro         | 2 +-
 src/plugins/streamers/lstream/unit_tests/unit_tests.pro | 2 --
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/streamers/lstream/db_plugin/db_plugin.pro b/src/plugins/streamers/lstream/db_plugin/db_plugin.pro
index a4555b659..298ea7768 100644
--- a/src/plugins/streamers/lstream/db_plugin/db_plugin.pro
+++ b/src/plugins/streamers/lstream/db_plugin/db_plugin.pro
@@ -6,7 +6,7 @@ include($$PWD/../../../db_plugin.pri)
 include($$PWD/../lstream.pri)
 include($$PWD/capnp/capnp.pri)
 
-INCLUDEPATH += capnp $$VERSION_INC $$PWD/../runtime/capnp $$PWD/../runtime/kj
+INCLUDEPATH += capnp $$VERSION_INC
 LIBS += -L$$DESTDIR/.. -lxkj -lxcapnp
 
 HEADERS += \
diff --git a/src/plugins/streamers/lstream/lay_plugin/lay_plugin.pro b/src/plugins/streamers/lstream/lay_plugin/lay_plugin.pro
index ed5de8b78..f73d83840 100644
--- a/src/plugins/streamers/lstream/lay_plugin/lay_plugin.pro
+++ b/src/plugins/streamers/lstream/lay_plugin/lay_plugin.pro
@@ -1,8 +1,8 @@
 
 DESTDIR = $$OUT_PWD/../../../../lay_plugins
 
-include($$PWD/../lstream.pri)
 include($$PWD/../../../lay_plugin.pri)
+include($$PWD/../lstream.pri)
 
 INCLUDEPATH += $$PWD/../db_plugin $$PWD/../db_plugin/capnp
 DEPENDPATH += $$PWD/../db_plugin
diff --git a/src/plugins/streamers/lstream/lstream.pri b/src/plugins/streamers/lstream/lstream.pri
index 6bca65188..b4a0709e1 100644
--- a/src/plugins/streamers/lstream/lstream.pri
+++ b/src/plugins/streamers/lstream/lstream.pri
@@ -10,3 +10,5 @@ equals(HAVE_QT, "0") || lessThan(QT_MAJOR_VERSION, 6) {
   QMAKE_CXXFLAGS += \
       -Wno-unused-parameter
 }
+
+ INCLUDEPATH += $$PWD/runtime/capnp $$PWD/runtime/kj
diff --git a/src/plugins/streamers/lstream/runtime/capnp/capnp.pro b/src/plugins/streamers/lstream/runtime/capnp/capnp.pro
index 71a856623..62e198bf0 100644
--- a/src/plugins/streamers/lstream/runtime/capnp/capnp.pro
+++ b/src/plugins/streamers/lstream/runtime/capnp/capnp.pro
@@ -1,6 +1,7 @@
 
 TEMPLATE = lib
 DESTDIR = $$OUT_PWD/../../../../..
+INCLUDEPATH =
 
 include($$PWD/../../lstream.pri)
 include($$PWD/capnp.pri)
@@ -10,7 +11,6 @@ SOURCES = $$CAPNP_SOURCES
 HEADERS = $$CAPNP_HEADERS
 
 DEFINES += CAPNP_LITE
-INCLUDEPATH = $$PWD/../kj
 LIBS = 
 QT = 
 
diff --git a/src/plugins/streamers/lstream/runtime/kj/kj.pro b/src/plugins/streamers/lstream/runtime/kj/kj.pro
index ad213c421..4725cde5a 100644
--- a/src/plugins/streamers/lstream/runtime/kj/kj.pro
+++ b/src/plugins/streamers/lstream/runtime/kj/kj.pro
@@ -1,6 +1,7 @@
 
 TEMPLATE = lib
 DESTDIR = $$OUT_PWD/../../../../..
+INCLUDEPATH =
 
 include($$PWD/../../lstream.pri)
 include($$PWD/kj.pri)
@@ -10,7 +11,6 @@ SOURCES = $$KJ_SOURCES
 HEADERS = $$KJ_HEADERS
 
 DEFINES = CAPNP_LITE
-INCLUDEPATH =
 LIBS = 
 QT = 
 
diff --git a/src/plugins/streamers/lstream/unit_tests/unit_tests.pro b/src/plugins/streamers/lstream/unit_tests/unit_tests.pro
index 4701cfe1e..e868e2af9 100644
--- a/src/plugins/streamers/lstream/unit_tests/unit_tests.pro
+++ b/src/plugins/streamers/lstream/unit_tests/unit_tests.pro
@@ -6,8 +6,6 @@ TARGET = lstream_tests
 include($$PWD/../../../../lib_ut.pri)
 include($$PWD/../lstream.pri)
 
-INCLUDEPATH += $$PWD/../runtime/capnp $$PWD/../runtime/kj
-
 SOURCES = \
   dbLStreamReaderTests.cc \
   dbLStreamWriterTests.cc