From fa25c765b25741d98aba6fe1a9ca2aa04b35a91a Mon Sep 17 00:00:00 2001
From: Tom Dealtry <t.dealtry@lancaster.ac.uk>
Date: Wed, 8 May 2024 10:57:17 +0100
Subject: [PATCH] Fix include logic

---
 CMakeLists.txt                                  | 6 ++++++
 HKG4PhysicsList/HKG4PhysicsList.cpp             | 2 +-
 HKGFileWriterRootWCSim/HKGFileWriterRootWCSim.h | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b259327..ae953a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,14 @@ include(HKPackageBuilder)
 hkbuilder_prepare_project()
 hk_check_dependencies()
 
+#add common functions directory
+include_directories(src BEFORE)
 add_subdirectory(src)
 
+#add ABC tools
+# This should really be improved to only be included for the inheriting tools, rather than all tools
+include_directories(HKGFileWriterBase BEFORE)
+
 # Add your tools here
 hk_add_tool(WCSim_exe)
 hk_add_tool(HKG4TrackingAction)
diff --git a/HKG4PhysicsList/HKG4PhysicsList.cpp b/HKG4PhysicsList/HKG4PhysicsList.cpp
index 15e5dc1..a28c8ad 100644
--- a/HKG4PhysicsList/HKG4PhysicsList.cpp
+++ b/HKG4PhysicsList/HKG4PhysicsList.cpp
@@ -1,6 +1,6 @@
 #include "HKG4PhysicsList.h"
 
-#include "../src/Utilities.h"
+#include "Utilities.h"
 
 #include "WCSimRunAction.hh"
 
diff --git a/HKGFileWriterRootWCSim/HKGFileWriterRootWCSim.h b/HKGFileWriterRootWCSim/HKGFileWriterRootWCSim.h
index a1b3647..d62a8c1 100644
--- a/HKGFileWriterRootWCSim/HKGFileWriterRootWCSim.h
+++ b/HKGFileWriterRootWCSim/HKGFileWriterRootWCSim.h
@@ -7,7 +7,7 @@
 #include "TTree.h"
 #include "TFile.h"
 
-#include "../HKGFileWriterBase/HKGFileWriterBase.h"
+#include "HKGFileWriterBase.h"
 
 #include <DataModel.h>
 #include "Tool.h"