Fix include logic

Author: tdealtry

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)

HKG4PhysicsList/HKG4PhysicsList.cpp

@@ -1,6 +1,6 @@
 #include "HKG4PhysicsList.h"
 
-#include "../src/Utilities.h"
+#include "Utilities.h"
 
 #include "WCSimRunAction.hh"
 

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"