From f18857da93ff5b0f0585d963617902ec13593821 Mon Sep 17 00:00:00 2001
From: jmcarcell <jmcarcell@users.noreply.github.com>
Date: Tue, 12 Sep 2023 10:53:40 +0200
Subject: [PATCH 1/4] Remove a CMake warning and make it easier to build with
 ROOT

---
 CMakeLists.txt       | 3 ++-
 tests/CMakeLists.txt | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96ae435..6794f4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.5)
 
 project(k4SimDelphes)
 
@@ -78,6 +78,7 @@ endif()
 #--- Non-optional Dependencies ------------------------------------------------
 find_package(Delphes REQUIRED)
 find_package(EDM4HEP REQUIRED)
+find_package(ROOT REQUIRED)
 
 #--- optional dependencies
 if(BUILD_PYTHIA_READER OR BUILD_EVTGEN_READER)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6aec16a..4b0b149 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -10,7 +10,7 @@ target_include_directories(compare_delphes_converter_outputs
   ${PROJECT_SOURCE_DIR}/converter/src #for delphesHelpers
   ${PROJECT_SOURCE_DIR}/converter/include
   )
-target_link_libraries(compare_delphes_converter_outputs PRIVATE EDM4HEP::edm4hep ${DELPHES_LIBRARY} podio::podioRootIO ROOT::Physics)
+target_link_libraries(compare_delphes_converter_outputs PRIVATE EDM4HEP::edm4hep EDM4HEP::kinematics ${DELPHES_LIBRARY} podio::podioRootIO ROOT::Core ROOT::MathCore ROOT::Physics)
 
 function(ADD_COMPARISON_TEST name converter)
   # Check if we have the standalone Delphes application available for the
@@ -29,7 +29,7 @@ function(ADD_COMPARISON_TEST name converter)
     COMMAND bash -x ${PROJECT_SOURCE_DIR}/tests/testDriver.sh ${converter} ${ARGN})
 
   set_property(TEST ${name} PROPERTY ENVIRONMENT
-    LD_LIBRARY_PATH=$<TARGET_FILE_DIR:DelphesEDM4HepConverter>:$<TARGET_FILE_DIR:EDM4HEP::edm4hepDict>:$<TARGET_FILE_DIR:podio::podioDict>:$<TARGET_FILE_DIR:ROOT::RIO>:$ENV{LD_LIBRARY_PATH}
+    LD_LIBRARY_PATH=$<TARGET_FILE_DIR:DelphesEDM4HepConverter>:$<TARGET_FILE_DIR:EDM4HEP::edm4hep>:$<TARGET_FILE_DIR:podio::podio>:$<TARGET_FILE_DIR:ROOT::RIO>:$ENV{LD_LIBRARY_PATH}
     PATH=$<TARGET_FILE_DIR:${converter}>:${DELPHES_BINARY_DIR}:$ENV{PATH}
     COMPARE=$<TARGET_FILE:compare_delphes_converter_outputs>
     )

From ae7b881a0dc7ff5461ffc50755b818f906953a7d Mon Sep 17 00:00:00 2001
From: jmcarcell <jmcarcell@users.noreply.github.com>
Date: Tue, 12 Sep 2023 11:00:14 +0200
Subject: [PATCH 2/4] Remove ROOT::Physics

---
 converter/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/converter/CMakeLists.txt b/converter/CMakeLists.txt
index 3134eaa..6b74b7a 100644
--- a/converter/CMakeLists.txt
+++ b/converter/CMakeLists.txt
@@ -16,7 +16,7 @@ target_link_libraries(DelphesEDM4HepConverter
                         podio::podio
                         ROOT::MathCore
                         ROOT::EG
-                        ROOT::Physics)
+                        )
 
 install(DIRECTORY include/
         TYPE INCLUDE)

From ed675c4bdc8a7aacd404e1d4c50a869e3f0563fd Mon Sep 17 00:00:00 2001
From: jmcarcell <jmcarcell@users.noreply.github.com>
Date: Tue, 12 Sep 2023 11:10:18 +0200
Subject: [PATCH 3/4] Fix test

---
 .../k4SimDelphes/examples/options/k4simdelphesalg_pythia.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/k4SimDelphes/examples/options/k4simdelphesalg_pythia.py b/framework/k4SimDelphes/examples/options/k4simdelphesalg_pythia.py
index b703a32..80e7505 100644
--- a/framework/k4SimDelphes/examples/options/k4simdelphesalg_pythia.py
+++ b/framework/k4SimDelphes/examples/options/k4simdelphesalg_pythia.py
@@ -1,5 +1,5 @@
 from Gaudi.Configuration import *
-from GaudiKernel import SystemOfUnits as units
+import os
 
 from Configurables import ApplicationMgr
 app = ApplicationMgr()

From fe4be3ba91f0a5ac8553a6232045fd96e866c1ec Mon Sep 17 00:00:00 2001
From: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com>
Date: Tue, 12 Sep 2023 22:12:30 +0200
Subject: [PATCH 4/4] Update CMakeLists.txt

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6794f4f..6855503 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 
 project(k4SimDelphes)