Merge branch 'lcg99_run2_patches' into 'run2-patches'

Fixes for LCG 99 (run2-patches) See merge request !915

Merge branch 'lcg99_run2_patches' into 'run2-patches'
Fixes for LCG 99 (run2-patches) See merge request !915
4c586603 · Marco Cattaneo · e5f3653d · a51c4eee · 4c586603 · 4c586603
Commit 4c586603 authored May 27, 2021 by Marco Cattaneo
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
 find_package(GaudiProject)
 #---------------------------------------------------------------

+# Workaround for rootcling not knowing what __nodiscard__ is
+find_package(ROOT)
+if(ROOT_VERSION MATCHES "^6\\.22.*")
+  set(PHYS_DICT_GEN_DEFAULT_OPTS  -Wno-unknown-attributes)
+  message(STATUS "Generating dictionaries with additional flags: " ${PHYS_DICT_GEN_DEFAULT_OPTS})
+endif()
+
 # Declare project name and version
 gaudi_project(Phys v26r7
              USE Rec v24r6)
--- a/Phys/DaVinciKernel/CMakeLists.txt
+++ b/Phys/DaVinciKernel/CMakeLists.txt
@@ -35,7 +35,8 @@ gaudi_add_dictionary(DaVinciKernel
                     dict/DaVinciKernelDict.h
                     dict/DaVinciKernelDict.xml
                     INCLUDE_DIRS Phys/DaVinciUtils
-                     LINK_LIBRARIES PhysEvent GaudiAlgLib PartPropLib RelationsLib DaVinciInterfacesLib DaVinciKernelLib)
+                     LINK_LIBRARIES PhysEvent GaudiAlgLib PartPropLib RelationsLib DaVinciInterfacesLib DaVinciKernelLib
+		     OPTIONS ${PHYS_DICT_GEN_DEFAULT_OPTS})

 gaudi_add_executable(Combiner1
                     tests/combiner1.cpp  

--- a/Phys/DaVinciMCKernel/CMakeLists.txt
+++ b/Phys/DaVinciMCKernel/CMakeLists.txt
@@ -33,4 +33,5 @@ gaudi_add_dictionary(DaVinciMCKernel
                     dict/DaVinciMCKernelDict.h
                     dict/DaVinciMCKernelDict.xml
                     INCLUDE_DIRS Associators/MCAssociators
-                     LINK_LIBRARIES GenEvent LinkerEvent MCEvent PhysEvent RecEvent DaVinciInterfacesLib LoKiCoreLib DaVinciMCKernelLib)
+                     LINK_LIBRARIES GenEvent LinkerEvent MCEvent PhysEvent RecEvent DaVinciInterfacesLib LoKiCoreLib DaVinciMCKernelLib
+		     OPTIONS ${PHYS_DICT_GEN_DEFAULT_OPTS})
--- a/Phys/LoKiAlgo/CMakeLists.txt
+++ b/Phys/LoKiAlgo/CMakeLists.txt
@@ -32,7 +32,8 @@ gaudi_add_dictionary(LoKiAlgo
                     dict/LoKiAlgoDict.h
                     dict/LoKiAlgo.xml
                     INCLUDE_DIRS PythonLibs PythonLibs
-                     LINK_LIBRARIES PythonLibs PythonLibs DaVinciKernelLib LoKiPhysLib GaudiPythonLib LoKiAlgo)
+                     LINK_LIBRARIES PythonLibs PythonLibs DaVinciKernelLib LoKiPhysLib GaudiPythonLib LoKiAlgo
+		     OPTIONS ${PHYS_DICT_GEN_DEFAULT_OPTS})

 gaudi_install_python_modules()


--- a/Phys/LoKiAlgo/LoKi/AlgoDecorator.h
+++ b/Phys/LoKiAlgo/LoKi/AlgoDecorator.h
@@ -61,11 +61,6 @@ namespace LoKi {
       */
      Alg( PyObject* self, const std::string& name ) : GaudiPython::PyAlg<ALGORITHM>( self, name ) {}
      // ======================================================================
-    protected:
-      // ======================================================================
-      /// virtual destructor
-      virtual ~Alg() {}
-      // ======================================================================
    public:
      // ======================================================================
      /// make "analyse" method overwritable form python

--- a/Phys/LoKiArrayFunctors/CMakeLists.txt
+++ b/Phys/LoKiArrayFunctors/CMakeLists.txt
@@ -37,7 +37,8 @@ gaudi_add_module(LoKiArrayFunctors
 gaudi_add_dictionary(LoKiArrayFunctors
                     dict/LoKiArrayFunctorsDict.h
                     dict/LoKiArrayFunctors.xml
-                     LINK_LIBRARIES LoKiPhysLib LoKiProtoParticles LoKiArrayFunctorsLib)
+                     LINK_LIBRARIES LoKiPhysLib LoKiProtoParticles LoKiArrayFunctorsLib
+		     OPTIONS ${PHYS_DICT_GEN_DEFAULT_OPTS})

 gaudi_install_python_modules()


--- a/Phys/LoKiPhys/CMakeLists.txt
+++ b/Phys/LoKiPhys/CMakeLists.txt
@@ -39,7 +39,8 @@ gaudi_add_module(LoKiPhys
 gaudi_add_dictionary(LoKiPhys
                     dict/LoKiPhysDict.h
                     dict/LoKiPhys.xml
-                     LINK_LIBRARIES PhysEvent DaVinciInterfacesLib KalmanFilter LoKiCoreLib LoKiUtils LoKiPhysLib)
+                     LINK_LIBRARIES PhysEvent DaVinciInterfacesLib KalmanFilter LoKiCoreLib LoKiUtils LoKiPhysLib
+		     OPTIONS ${PHYS_DICT_GEN_DEFAULT_OPTS})

 if(GAUDI_BUILD_TESTS)
  gaudi_add_executable(DecayGrammarTest

--- a/Phys/LoKiProtoParticles/CMakeLists.txt
+++ b/Phys/LoKiProtoParticles/CMakeLists.txt
@@ -28,7 +28,8 @@ gaudi_add_library(LoKiProtoParticles
 gaudi_add_dictionary(LoKiProtoParticles
                     dict/LoKiProtoParticlesDict.h
                     dict/LoKiProtoParticles.xml
-                     LINK_LIBRARIES RecEvent DaVinciInterfacesLib LoKiCoreLib LoKiUtils LoKiTracksLib LoKiProtoParticles)
+                     LINK_LIBRARIES RecEvent DaVinciInterfacesLib LoKiCoreLib LoKiUtils LoKiTracksLib LoKiProtoParticles
+		     OPTIONS ${PHYS_DICT_GEN_DEFAULT_OPTS})

 gaudi_install_python_modules()


--- a/Phys/LoKiTracks/CMakeLists.txt
+++ b/Phys/LoKiTracks/CMakeLists.txt
@@ -25,7 +25,8 @@ gaudi_add_dictionary(LoKiTracks
                     dict/LoKiTracksDict.h
                     dict/LoKiTracks.xml
                     INCLUDE_DIRS Tr/TrackInterfaces Rec/LoKiTrack
-                     LINK_LIBRARIES TrackEvent LoKiCoreLib LoKiTrackLib LoKiTracksLib)
+                     LINK_LIBRARIES TrackEvent LoKiCoreLib LoKiTrackLib LoKiTracksLib
+		     OPTIONS ${PHYS_DICT_GEN_DEFAULT_OPTS})

 gaudi_add_library(LoKiTracksLib
                  src/*.cpp