Commit 4c586603 authored by Marco Cattaneo's avatar Marco Cattaneo
Browse files

Merge branch 'lcg99_run2_patches' into 'run2-patches'

Fixes for LCG 99 (run2-patches)

See merge request !915
parents e5f3653d a51c4eee
Pipeline #2653435 passed with stage
in 20 seconds
......@@ -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)
......@@ -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
......
......@@ -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})
......@@ -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()
......
......@@ -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
......
......@@ -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()
......
......@@ -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
......
......@@ -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()
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment