Migrate FWCore.

CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0)
 
+find_package(ROOT COMPONENTS RIO Tree)
+
 find_package(GaudiProject)
 
-gaudi_project(CEPCSW HEAD
-              USE Gaudi v29r2 )
+# Set up C++ Standard
+# ``-DCMAKE_CXX_STANDARD=<standard>`` when invoking CMake
\ No newline at end of file
+set(CMAKE_CXX_STANDARD 17 CACHE STRING "")
+
+if(NOT CMAKE_CXX_STANDARD MATCHES "14|17")
+  message(FATAL_ERROR "Unsupported C++ standard: ${CMAKE_CXX_STANDARD}")
+endif()
+
+
+gaudi_project(CEPCSW v0r1
+              USE Gaudi v33r1 )
\ No newline at end of file

FWCore/CMakeLists.txt

@@ -6,7 +6,6 @@ gaudi_subdir(FWCore v0r1)
 find_package(podio REQUIRED)
 find_package(plcio REQUIRED)
 find_package(LCIO REQUIRED)
-find_package(ROOT COMPONENTS RIO Tree)
 
 # this declaration will not be needed in the future
 gaudi_depends_on_subdirs(GaudiAlg GaudiKernel)
@@ -15,8 +14,8 @@ gaudi_install_python_modules()
 
 gaudi_add_library(FWCore
 		  src/*.cpp
-                  INCLUDE_DIRS ${podio_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS} ${plcio_INCLUDE_DIRS} ROOT
-                  LINK_LIBRARIES GaudiAlgLib GaudiKernel ${podio_LIBRARIES} ${LCIO_LIBRARIES} ${plcio_LIBRARIES} ROOT
+                  INCLUDE_DIRS podio ${LCIO_INCLUDE_DIRS} ${plcio_INCLUDE_DIRS} ROOT
+                  LINK_LIBRARIES GaudiAlgLib GaudiKernel podio::podioRootIO ${LCIO_LIBRARIES} ${plcio_LIBRARIES} ROOT
                   PUBLIC_HEADERS FWCore)
 
 gaudi_add_module(FWCorePlugins

FWCore/FWCore/LCIODataSvc.h

@@ -29,8 +29,6 @@
 class LCIODataSvc : public DataSvc {
 public:
 
-  friend class SvcFactory<LCIODataSvc>;
-
   typedef std::vector<std::pair<std::string, podio::CollectionBase*>> CollRegistry;
 
   virtual StatusCode initialize();

FWCore/src/components/CEPCDataSvc.cpp

@@ -6,7 +6,7 @@
 
 // Instantiation of a static factory class used by clients to create
 // instances of this service
-DECLARE_SERVICE_FACTORY(CEPCDataSvc)
+DECLARE_COMPONENT(CEPCDataSvc)
 
 /// Standard Constructor
 CEPCDataSvc::CEPCDataSvc(const std::string& name, ISvcLocator* svc)

FWCore/src/components/CEPCDataSvc.h

@@ -5,7 +5,6 @@
 
 class CEPCDataSvc : public PodioDataSvc
 {
-  friend class SvcFactory<CEPCDataSvc>;
 
 public:
   /// Standard Constructor

FWCore/src/components/LCIODataSvc.cpp

@@ -16,7 +16,7 @@
 
 typedef std::vector<lcio::MCParticle*> MCParticleVec ;  
 
-DECLARE_SERVICE_FACTORY(LCIODataSvc)
+DECLARE_COMPONENT(LCIODataSvc)
 /// Service initialisation
 StatusCode LCIODataSvc::initialize() {
   // Nothing to do: just call base class initialisation

FWCore/src/components/LCIOInput.h

@@ -19,7 +19,6 @@ class LCIODataSvc;
  */
 
 class LCIOInput : public GaudiAlgorithm {
-  friend class AlgFactory<LCIOInput>;
 
 public:
   /// Constructor.

FWCore/src/components/PodioInput.h

@@ -19,7 +19,6 @@ class PodioDataSvc;
  */
 
 class PodioInput : public GaudiAlgorithm {
-  friend class AlgFactory<PodioInput>;
 
 public:
   /// Constructor.

FWCore/src/components/PodioOutput.h

@@ -14,7 +14,6 @@ class TFile;
 class PodioDataSvc;
 
 class PodioOutput : public GaudiAlgorithm {
-  friend class AlgFactory<PodioOutput>;
 
 public:
   /// Constructor.