From f5bad31c213f85c5eb5a2d8ded25386ce6273fca Mon Sep 17 00:00:00 2001 From: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com> Date: Thu, 19 Oct 2023 20:23:46 +0200 Subject: [PATCH] Do not forward declare `podio::ObjectID` (#31) * Add podio and an alias library * Don't forward declare podio::ObjectID * Use the correct spelling --------- Co-authored-by: jmcarcell --- CMakeLists.txt | 1 + k4EDM4hep2LcioConv/CMakeLists.txt | 1 + tests/src/ComparisonUtils.h | 1 - tests/src/ObjectMapping.cc | 1 - tests/src/ObjectMapping.h | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8067293..152a0b37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,7 @@ endif() include(cmake/compiler_output.cmake) find_package(LCIO REQUIRED) +find_package(podio REQUIRED) find_package(EDM4HEP REQUIRED) add_subdirectory(k4EDM4hep2LcioConv) diff --git a/k4EDM4hep2LcioConv/CMakeLists.txt b/k4EDM4hep2LcioConv/CMakeLists.txt index a223e865..773d21fa 100644 --- a/k4EDM4hep2LcioConv/CMakeLists.txt +++ b/k4EDM4hep2LcioConv/CMakeLists.txt @@ -2,6 +2,7 @@ add_library(k4EDM4hep2LcioConv SHARED src/k4EDM4hep2LcioConv.cpp src/k4Lcio2EDM4hepConv.cpp ) +add_library(k4EDM4hep2LcioConv::k4EDM4hep2LcioConv ALIAS k4EDM4hep2LcioConv) target_include_directories(k4EDM4hep2LcioConv PUBLIC ${LCIO_INCLUDE_DIRS} diff --git a/tests/src/ComparisonUtils.h b/tests/src/ComparisonUtils.h index 0ef4fe75..fbe6ed85 100644 --- a/tests/src/ComparisonUtils.h +++ b/tests/src/ComparisonUtils.h @@ -12,7 +12,6 @@ #include "EVENT/LCCollection.h" #include "podio/RelationRange.h" -#include "podio/ObjectID.h" #include #include diff --git a/tests/src/ObjectMapping.cc b/tests/src/ObjectMapping.cc index ca8616ff..06de56aa 100644 --- a/tests/src/ObjectMapping.cc +++ b/tests/src/ObjectMapping.cc @@ -30,7 +30,6 @@ #include "edm4hep/RawTimeSeriesCollection.h" #include "edm4hep/VertexCollection.h" -#include "podio/ObjectID.h" #include "podio/Frame.h" template diff --git a/tests/src/ObjectMapping.h b/tests/src/ObjectMapping.h index ff382d67..00bd04b7 100644 --- a/tests/src/ObjectMapping.h +++ b/tests/src/ObjectMapping.h @@ -2,6 +2,7 @@ #define K4EDM4HEP2LCIOCONV_TEST_OBJECTMAPPINGS_H #include +#include "podio/ObjectID.h" namespace EVENT { class Track; @@ -20,7 +21,6 @@ namespace EVENT { } // namespace EVENT namespace podio { - class ObjectID; class Frame; } // namespace podio