From 6cf1bd3b5bf19bb6f963a9c7d31a8968042302b9 Mon Sep 17 00:00:00 2001 From: Oliver Lantwin Date: Thu, 10 Oct 2024 15:38:06 +0200 Subject: [PATCH] CMake: Use external genfit2 in build --- CHANGELOG.md | 2 +- TimeDet/CMakeLists.txt | 2 ++ UpstreamTagger/CMakeLists.txt | 2 ++ ecal/CMakeLists.txt | 3 ++- hcal/CMakeLists.txt | 3 ++- muon/CMakeLists.txt | 2 ++ nutaudet/CMakeLists.txt | 2 ++ pid/CMakeLists.txt | 2 ++ shipdata/CMakeLists.txt | 7 +++---- shipgen/CMakeLists.txt | 2 ++ splitcal/CMakeLists.txt | 2 ++ strawtubes/CMakeLists.txt | 2 ++ veto/CMakeLists.txt | 2 ++ 13 files changed, 26 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 407009a2bb..7883dca47f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,7 @@ it in future. ### Changed * shipStrawTracking: Move to argparse -* CMake: Require external genfit2 +* CMake: Use external genfit2 ### Removed diff --git a/TimeDet/CMakeLists.txt b/TimeDet/CMakeLists.txt index b5a075cfa7..35bc70f1aa 100644 --- a/TimeDet/CMakeLists.txt +++ b/TimeDet/CMakeLists.txt @@ -5,6 +5,7 @@ set(INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/shipdata ${CMAKE_SOURCE_DIR}/TimeDet +${genfit2_INCDIR} ) include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR}) @@ -13,6 +14,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES ${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} +${genfit2_LIBDIR} ) link_directories( ${LINK_DIRECTORIES}) diff --git a/UpstreamTagger/CMakeLists.txt b/UpstreamTagger/CMakeLists.txt index 1402f7c088..c4f0cfd912 100644 --- a/UpstreamTagger/CMakeLists.txt +++ b/UpstreamTagger/CMakeLists.txt @@ -5,6 +5,7 @@ set(INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/shipdata ${CMAKE_SOURCE_DIR}/UpstreamTagger +${genfit2_INCDIR} ) include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR}) @@ -12,6 +13,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES ${ROOT_LIBRARY_DIR} +${genfit2_LIBDIR} ${FAIRROOT_LIBRARY_DIR} ) diff --git a/ecal/CMakeLists.txt b/ecal/CMakeLists.txt index 30b540fd23..f024f3f322 100644 --- a/ecal/CMakeLists.txt +++ b/ecal/CMakeLists.txt @@ -6,6 +6,7 @@ set(INCLUDE_DIRECTORIES #put here all directories where header files are located ${CMAKE_SOURCE_DIR}/shipdata ${CMAKE_SOURCE_DIR}/ecal +${genfit2_INCDIR} ) include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR}) @@ -14,7 +15,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES ${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} - +${genfit2_LIBDIR} ) link_directories( ${LINK_DIRECTORIES}) diff --git a/hcal/CMakeLists.txt b/hcal/CMakeLists.txt index 759e9b214d..1be1203a65 100644 --- a/hcal/CMakeLists.txt +++ b/hcal/CMakeLists.txt @@ -5,6 +5,7 @@ set(INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/shipdata ${CMAKE_SOURCE_DIR}/hcal +${genfit2_INCDIR} ) include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR}) @@ -13,7 +14,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES ${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} - +${genfit2_LIBDIR} ) link_directories( ${LINK_DIRECTORIES}) diff --git a/muon/CMakeLists.txt b/muon/CMakeLists.txt index 33a1b5c0cb..139f151e2a 100644 --- a/muon/CMakeLists.txt +++ b/muon/CMakeLists.txt @@ -5,6 +5,7 @@ set(INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/shipdata ${CMAKE_SOURCE_DIR}/muon +${genfit2_INCDIR} ${VMC_INCLUDE_DIRS} ) @@ -13,6 +14,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES ${ROOT_LIBRARY_DIR} +${genfit2_LIBDIR} ${FAIRROOT_LIBRARY_DIR} ) diff --git a/nutaudet/CMakeLists.txt b/nutaudet/CMakeLists.txt index ff880e6d7d..9389bf0ad7 100644 --- a/nutaudet/CMakeLists.txt +++ b/nutaudet/CMakeLists.txt @@ -8,6 +8,7 @@ ${CMAKE_SOURCE_DIR}/shipdata ${CMAKE_SOURCE_DIR}/nutaudet ${ROOT_INCLUDE_DIR} ${VMC_INCLUDE_DIRS} +${genfit2_INCDIR} ) include_directories(${INCLUDE_DIRECTORIES} ${FAIRROOT_INCLUDE_DIR}) @@ -16,6 +17,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES ${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} +${genfit2_LIBDIR} ) link_directories( ${LINK_DIRECTORIES}) diff --git a/pid/CMakeLists.txt b/pid/CMakeLists.txt index a91553c386..9d03c8c7cd 100644 --- a/pid/CMakeLists.txt +++ b/pid/CMakeLists.txt @@ -5,6 +5,7 @@ set(INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/shipdata ${CMAKE_SOURCE_DIR}/pid +${genfit2_INCDIR} ) include_directories( ${INCLUDE_DIRECTORIES}) @@ -13,6 +14,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES ${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} +${genfit2_LIBDIR} ) link_directories( ${LINK_DIRECTORIES}) diff --git a/shipdata/CMakeLists.txt b/shipdata/CMakeLists.txt index b73157c23d..efe46d02fb 100644 --- a/shipdata/CMakeLists.txt +++ b/shipdata/CMakeLists.txt @@ -4,8 +4,7 @@ set(INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/shipdata -${CMAKE_SOURCE_DIR}/genfit/core/include -${CMAKE_SOURCE_DIR}/genfit/fitters/include +${genfit2_INCDIR} ${VMC_INCLUDE_DIRS} ) @@ -16,7 +15,7 @@ set(LINK_DIRECTORIES ${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} ${CMAKE_SOURCE_DIR}/shipdata - +${genfit2_LIBDIR} ) link_directories( ${LINK_DIRECTORIES}) @@ -32,6 +31,6 @@ TrackInfo.cxx Set(HEADERS ) Set(LINKDEF MCStackLinkDef.h) Set(LIBRARY_NAME ShipData) -set(DEPENDENCIES Base EG Physics Core genfit FairLogger::FairLogger) +set(DEPENDENCIES Base EG Physics Core genfit2 FairLogger::FairLogger) GENERATE_LIBRARY() diff --git a/shipgen/CMakeLists.txt b/shipgen/CMakeLists.txt index aac9a778cd..eecc1e4c2b 100644 --- a/shipgen/CMakeLists.txt +++ b/shipgen/CMakeLists.txt @@ -7,6 +7,7 @@ ${CMAKE_SOURCE_DIR}/shipgen ${CMAKE_SOURCE_DIR}/generators ${CMAKE_SOURCE_DIR}/shipdata ${CMAKE_SOURCE_DIR}/veto +${genfit2_INCDIR} ) set(SYSTEM_INCLUDE_DIRECTORIES @@ -26,6 +27,7 @@ ${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} ${PYTHIA8_LIBRARY_DIR} ${EVTGEN_LIBRARY_DIR} +${genfit2_LIBDIR} ${SIMPATH}/lib ) diff --git a/splitcal/CMakeLists.txt b/splitcal/CMakeLists.txt index 50b2e7c43e..018642a714 100644 --- a/splitcal/CMakeLists.txt +++ b/splitcal/CMakeLists.txt @@ -5,6 +5,7 @@ set(INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/shipdata ${CMAKE_SOURCE_DIR}/splitcal +${genfit2_INCDIR} ) include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR}) @@ -13,6 +14,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES ${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} +${genfit2_LIBDIR} ) link_directories( ${LINK_DIRECTORIES}) diff --git a/strawtubes/CMakeLists.txt b/strawtubes/CMakeLists.txt index 437a64e425..38ca99b1a5 100644 --- a/strawtubes/CMakeLists.txt +++ b/strawtubes/CMakeLists.txt @@ -5,6 +5,7 @@ set(INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/shipdata ${CMAKE_SOURCE_DIR}/strawtubes +${genfit2_INCDIR} ) include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR}) @@ -13,6 +14,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES ${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} +${genfit2_LIBDIR} ) link_directories( ${LINK_DIRECTORIES}) diff --git a/veto/CMakeLists.txt b/veto/CMakeLists.txt index 5da1c94daf..62b0270a6d 100644 --- a/veto/CMakeLists.txt +++ b/veto/CMakeLists.txt @@ -5,6 +5,7 @@ set(INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/shipdata ${CMAKE_SOURCE_DIR}/veto +${genfit2_INCDIR} ) include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR}) @@ -13,6 +14,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES ${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} +${genfit2_LIBDIR} ) link_directories( ${LINK_DIRECTORIES})