Skip to content

Migrate to LCG 109: compile core software and simulation

lintao@ihep.ac.cn requested to merge lintao/upgrade/lcg-109 into master

Part of the project could be compiled using LCG 109 (EDM4hep 1.0) and k4FWCore 01.06. Some external libraries are also migrated.

Here are the code not committed:

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbf1f1f..b46e8a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ set(CMAKE_INSTALL_LIBDIR lib)

 # Set up C++ Standard
 # ``-DCMAKE_CXX_STANDARD=<standard>`` when invoking CMake
-set(CMAKE_CXX_STANDARD 17 CACHE STRING "")
+set(CMAKE_CXX_STANDARD 20 CACHE STRING "")

 if(NOT CMAKE_CXX_STANDARD MATCHES "17|20")
   message(FATAL_ERROR "Unsupported C++ standard: ${CMAKE_CXX_STANDARD}")
@@ -52,12 +52,12 @@ list(PREPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") # (Find*.cmake)
 include(cmake/CEPCSWOptions.cmake)
 include(cmake/CEPCSWDependencies.cmake)

-add_subdirectory(Analysis)
+# add_subdirectory(Analysis)
 add_subdirectory(Detector)
 add_subdirectory(Digitization)
 add_subdirectory(Examples)
 add_subdirectory(Generator)
-add_subdirectory(Reconstruction)
+# add_subdirectory(Reconstruction)
 add_subdirectory(Service)
 add_subdirectory(Simulation)
 add_subdirectory(Utilities)

diff --git a/Service/CMakeLists.txt b/Service/CMakeLists.txt
index 04f57ab..1902ab0 100644
--- a/Service/CMakeLists.txt
+++ b/Service/CMakeLists.txt
@@ -3,4 +3,4 @@ add_subdirectory(GearSvc)
 add_subdirectory(TrackSystemSvc)
 add_subdirectory(SimplePIDSvc)
 add_subdirectory(CrystalEcalSvc)
-add_subdirectory(FinalPIDSvc)
+# add_subdirectory(FinalPIDSvc)

diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index 8569084..1eca250 100644
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -2,6 +2,6 @@ add_subdirectory(DataHelper)
 #obsolete, import through FetchContent now
 #add_subdirectory(KalTest)
 add_subdirectory(KalDet)
-add_subdirectory(KiTrack)
+# add_subdirectory(KiTrack)
 add_subdirectory(DecoderHelper)


diff --git a/cmake/CEPCSWDependencies.cmake b/cmake/CEPCSWDependencies.cmake
index 5971d02..3f60a7d 100644
--- a/cmake/CEPCSWDependencies.cmake
+++ b/cmake/CEPCSWDependencies.cmake
@@ -44,10 +44,10 @@ find_package(GenFit)
 find_package(GSL REQUIRED)
 find_package(HepMC)
 find_package(k4FWCore REQUIRED)
-find_package(LCContent REQUIRED)
+# find_package(LCContent REQUIRED)
 find_package(LCIO REQUIRED)
 find_package(OnnxRuntime REQUIRED)
-find_package(PandoraSDK REQUIRED)
+# find_package(PandoraSDK REQUIRED)
 find_package(podio REQUIRED)
 find_package(Pythia8 REQUIRED)
 find_package(ROOT COMPONENTS EG Geom GenVector Graf Graf3d Gpad MathCore Net RIO Tree TreePlayer REQUIRED)
Edited by lintao@ihep.ac.cn

Merge request reports

Loading