From faaa03ad72e248529177718a372a431252db8dcd Mon Sep 17 00:00:00 2001
From: tmadlener <thomas.madlener@desy.de>
Date: Tue, 11 Jun 2024 14:44:08 +0200
Subject: [PATCH] Remove unnecessary dictionary generation for I/O interfaces

---
 include/podio/Reader.h | 3 +--
 include/podio/Writer.h | 3 +--
 src/CMakeLists.txt     | 8 +++++---
 src/io_selection.xml   | 6 ------
 4 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 src/io_selection.xml

diff --git a/include/podio/Reader.h b/include/podio/Reader.h
index b7dcc8dea..ebce75a3e 100644
--- a/include/podio/Reader.h
+++ b/include/podio/Reader.h
@@ -7,8 +7,7 @@
 namespace podio {
 
 class Reader {
-public:
-  // ROOT dictionary generation needs this to be public for some reason
+private:
   struct ReaderConcept {
     virtual ~ReaderConcept() = default;
 
diff --git a/include/podio/Writer.h b/include/podio/Writer.h
index 792da9336..ca5b5d4c6 100644
--- a/include/podio/Writer.h
+++ b/include/podio/Writer.h
@@ -6,8 +6,7 @@
 namespace podio {
 
 class Writer {
-public:
-  // ROOT dictionary generation needs this to be public for some reason
+private:
   struct WriterConcept {
     virtual ~WriterConcept() = default;
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2e67cf5ba..393e93383 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -148,7 +148,11 @@ set(io_headers
   ${PROJECT_SOURCE_DIR}/include/podio/Reader.h
   )
 
-PODIO_ADD_LIB_AND_DICT(podioIO "${io_headers}" "${io_sources}" io_selection.xml)
+add_library(podioIO SHARED ${io_sources})
+add_library(podio::podioIO ALIAS podioIO)
+target_include_directories(podioIO PUBLIC
+    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 target_link_libraries(podioIO PUBLIC podio::podio podio::podioRootIO)
 if(ENABLE_SIO)
   target_link_libraries(podioIO PUBLIC podio::podioSioIO)
@@ -172,8 +176,6 @@ install(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/libpodioDict_rdict.pcm
   ${CMAKE_CURRENT_BINARY_DIR}/podioRootIODictDict.rootmap
   ${CMAKE_CURRENT_BINARY_DIR}/libpodioRootIODict_rdict.pcm
-  ${CMAKE_CURRENT_BINARY_DIR}/podioIODictDict.rootmap
-  ${CMAKE_CURRENT_BINARY_DIR}/libpodioIODict_rdict.pcm
   DESTINATION "${CMAKE_INSTALL_LIBDIR}")
 
 if (ENABLE_SIO)
diff --git a/src/io_selection.xml b/src/io_selection.xml
deleted file mode 100644
index ffeeb5eef..000000000
--- a/src/io_selection.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<lcgdict>
-  <selection>
-    <class name="podio::Reader"/>
-    <class name="podio::Writer"/>
-  </selection>
-</lcgdict>