WIP: starting the migration from lcg97 to lcg98 (Gaudi v35)

Analysis/CMakeLists.txt

+
+add_subdirectory(TotalInvMass)

Analysis/TotalInvMass/CMakeLists.txt

-gaudi_subdir(TotalInvMass v0r0)
 
 find_package(CLHEP REQUIRED;CONFIG)
-find_package(DD4hep COMPONENTS DDG4 REQUIRED)
 find_package(EDM4HEP REQUIRED)
-find_package(GEAR REQUIRED)
 find_package(GSL REQUIRED ) 
 find_package(LCIO REQUIRED ) 
-find_package(podio REQUIRED ) 
 find_package(k4FWCore REQUIRED)
 
 set(TotalInvMass_srcs src/TotalInvMass.cc)
 
-gaudi_add_module(TotalInvMass ${TotalInvMass_srcs}
-    INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
-    LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES}
-    EDM4HEP::edm4hep EDM4HEP::edm4hepDict
+gaudi_add_module(TotalInvMass
+                 SOURCES ${TotalInvMass_srcs}
+                 LINK k4FWCore::k4FWCore 
+                      Gaudi::GaudiKernel 
+                      Gaudi::GaudiAlgLib 
+                      ${CLHEP_LIBRARIES} 
+                      ${GSL_LIBRARIES}
+                      ${LCIO_LIBRARIES}
+                      EDM4HEP::edm4hep EDM4HEP::edm4hepDict
+                      ${ROOT_LIBRARIES}
 )

Analysis/TotalInvMass/src/TotalInvMass.hh

@@ -2,7 +2,7 @@
 #define _TotalInvMass_hh_
 
 #include "GaudiAlg/GaudiAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include <Gaudi/Property.h>
 
 #include "k4FWCore/DataHandle.h"
 

CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0)
 
+project(CEPCSW)
+
 find_package(ROOT COMPONENTS RIO Tree)
 
-find_package(GaudiProject)
+find_package(Gaudi)
 
 # Set up C++ Standard
 # ``-DCMAKE_CXX_STANDARD=<standard>`` when invoking CMake
@@ -12,8 +14,4 @@ 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 
-              USE k4FWCore v0r1
-)
\ No newline at end of file
+add_subdirectory(Analysis)

build.sh

@@ -77,8 +77,8 @@ function run-make() {
 ##############################################################################
 
 # The current default platform
-lcg_platform=x86_64-slc6-gcc8-opt
-lcg_version=97.0.2
+lcg_platform=x86_64-centos7-gcc8-opt
+lcg_version=98.0.0
 
 check-cepcsw-envvar || exit -1
 

setup.sh

@@ -30,7 +30,7 @@ function cepcsw-external() {
 }
 
 function setup-external() {
-    local f=$(cepcsw-external)/setup.sh
+    local f=$(cepcsw-external)/setup-${CEPCSW_LCG_VERSION}.sh
     if [ ! -f $f ]; then
         error: "Failed to find setup script $f"
         return
@@ -49,7 +49,7 @@ function setup-external() {
 # CEPCSW_LCG_VERSION=${1}; shift
 
 if [ -z "$CEPCSW_LCG_VERSION" ]; then
-    CEPCSW_LCG_VERSION=97.0.2
+    CEPCSW_LCG_VERSION=98.0.0
 fi
 export CEPCSW_LCG_VERSION