Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HepMC, HepPDT cmake fix #12

Merged
merged 3 commits into from
Mar 25, 2022
Merged

HepMC, HepPDT cmake fix #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
792cd2d
cmake: correct var names for hepmc3, heppdt include dirs
vvolkl Mar 25, 2022
5f4d442
silence compiler warnings
vvolkl Mar 25, 2022
4219a4c
cmake: add evtgen_include_dir
vvolkl Mar 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion k4Gen/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ gaudi_add_module(k4Gen
SOURCES ${k4gen_plugin_sources}
LINK Gaudi::GaudiKernel ${HEPMC3_LIBRARIES} Gaudi::GaudiAlgLib k4FWCore::k4FWCore ${HEPPDT_LIBRARIES} ${EVTGEN_LIBRARIES} EDM4HEP::edm4hep EDM4HEP::edm4hepDict)

target_include_directories(k4Gen PUBLIC ${PYTHIA8_INCLUDE_DIRS} ${HEPMC3_INCLUDE_DIRS}
target_include_directories(k4Gen PUBLIC ${PYTHIA8_INCLUDE_DIRS}
${HEPMC3_INCLUDE_DIR}
${HEPPDT_ICNCLUDE_DIR}
${EVTGEN_INCLUDE_DIR}
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)

Expand Down
2 changes: 1 addition & 1 deletion k4Gen/src/components/HepMCFullMerge.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* Implementation partly due to pilemc https://pilemc.hepforge.org/
*/

class HepMCFullMerge : public GaudiTool, virtual public IHepMCMergeTool {
class HepMCFullMerge final: public GaudiTool, virtual public IHepMCMergeTool {
public:
HepMCFullMerge(const std::string& type, const std::string& name, const IInterface* parent);

Expand Down
2 changes: 1 addition & 1 deletion k4Gen/src/components/HepMCSimpleMerge.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "GaudiKernel/RndmGenerators.h"


class HepMCSimpleMerge : public GaudiTool, virtual public IHepMCMergeTool {
class HepMCSimpleMerge final: public GaudiTool, virtual public IHepMCMergeTool {
public:
HepMCSimpleMerge(const std::string& type, const std::string& name, const IInterface* parent);

Expand Down