From bc6e44007edba1f1df92a010290b464312e3797d Mon Sep 17 00:00:00 2001
From: Juraj Smiesko <juraj.smiesko@cern.ch>
Date: Thu, 20 Jul 2023 16:16:04 +0200
Subject: [PATCH] Streamlined sub-package CMakeLists.txt

---
 analyzers/dataframe/CMakeLists.txt |  6 +++---
 setup.sh                           |  2 ++
 templates/CMakeLists.txt           | 15 ++++-----------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/analyzers/dataframe/CMakeLists.txt b/analyzers/dataframe/CMakeLists.txt
index 1c5cfb32d3..1b17df439b 100644
--- a/analyzers/dataframe/CMakeLists.txt
+++ b/analyzers/dataframe/CMakeLists.txt
@@ -59,7 +59,7 @@ message(STATUS " ====== DELPHES LIBRARY = " ${DELPHES_LIBRARY} )
 message(STATUS " ====== DELPHES_EXTERNALS_TKCOV_INCLUDE_DIR = " ${DELPHES_EXTERNALS_TKCOV_INCLUDE_DIR} )
 
 
-target_link_libraries(FCCAnalyses
+target_link_libraries(FCCAnalyses PUBLIC
                       ROOT::Physics
                       ROOT::MathCore
                       ROOT::ROOTVecOps
@@ -73,11 +73,11 @@ target_link_libraries(FCCAnalyses
                       )
 
 if(WITH_DD4HEP)
-  target_link_libraries(FCCAnalyses DD4hep::DDCore)
+  target_link_libraries(FCCAnalyses PUBLIC DD4hep::DDCore)
 endif()
 
 if(WITH_ACTS)
-  target_link_libraries(FCCAnalyses ActsCore)
+  target_link_libraries(FCCAnalyses PUBLIC ActsCore)
 endif()
 
 set_target_properties(FCCAnalyses PROPERTIES
diff --git a/setup.sh b/setup.sh
index 01e891274f..b7076b2467 100644
--- a/setup.sh
+++ b/setup.sh
@@ -22,6 +22,8 @@ if [ "${0}" != "${BASH_SOURCE}" ]; then
   export PATH=${LOCAL_DIR}/install/bin:${PATH}
   export LD_LIBRARY_PATH=${LOCAL_DIR}/install/lib:${LD_LIBRARY_PATH}
   export CMAKE_PREFIX_PATH=${LOCAL_DIR}/install:${CMAKE_PREFIX_PATH}
+
+  export ROOT_INCLUDE_PATH=`fastjet-config --prefix`/include:${ROOT_INCLUDE_PATH}
   export ROOT_INCLUDE_PATH=${LOCAL_DIR}/install/include:${ROOT_INCLUDE_PATH}
 
   export ONNXRUNTIME_ROOT_DIR=`python -c "import onnxruntime; print(onnxruntime.__path__[0]+'/../../../..')" 2> /dev/null`
diff --git a/templates/CMakeLists.txt b/templates/CMakeLists.txt
index 3ed120566d..c34561b064 100644
--- a/templates/CMakeLists.txt
+++ b/templates/CMakeLists.txt
@@ -1,8 +1,7 @@
 cmake_minimum_required(VERSION 3.16.9)
 project(__pkgname__ CXX)
 set(lib_name "FCCAnalysis___pkgname__")
-find_package(ROOT COMPONENTS ROOTVecOps ROOTDataFrame REQUIRED)
-find_package(EDM4HEP REQUIRED)
+find_package(FCCAnalyses)
 #--- Set a better default for installation directory---------------------------
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   set(CMAKE_INSTALL_PREFIX "__fccpath__/install" CACHE PATH "default install path" FORCE)
@@ -22,15 +21,9 @@ reflex_generate_dictionary(lib${lib_name} ${headers} ${classes}
 #--- build the analysis library (linked against FCCAnalyses)
 add_library(${lib_name} SHARED ${sources} ${headers} lib${lib_name}.cxx)
 target_include_directories(${lib_name} PUBLIC include
-                                              ${FCCANALYSES_DIR}
-                                              ${FCCANALYSES_DIR}/addons
-                                              ${FCCANALYSES_DIR}/analyzers/dataframe
-                                              $<INSTALL_INTERFACE:include>)
-target_link_directories(${lib_name} PUBLIC ${FCCANALYSES_DIR}
-                                           ${FCCANALYSES_DIR}/install/lib)
-target_link_libraries(${lib_name} PUBLIC FCCAnalyses
-                                         EDM4HEP::edm4hep EDM4HEP::edm4hepDict
-                                         ROOT::ROOTVecOps)
+                                              $<INSTALL_INTERFACE:include>
+)
+target_link_libraries(${lib_name} PUBLIC FCCAnalyses::FCCAnalyses)
 set_target_properties(${lib_name} PROPERTIES PUBLIC_HEADER "${headers}")
 install(TARGETS ${lib_name}
         RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" COMPONENT bin