Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Gauss
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LAMBDA
Gauss
Commits
e9f9bd4f
Commit
e9f9bd4f
authored
6 years ago
by
Thomas Latham
Browse files
Options
Downloads
Patches
Plain Diff
Cache some LbEvtGen variables, pass Gaudi C++ std to EvtGen build
parent
798bf18f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Gen/LbEvtGen/CMakeLists.txt
+18
-10
18 additions, 10 deletions
Gen/LbEvtGen/CMakeLists.txt
Sim/Gauss/CMakeLists.txt
+1
-1
1 addition, 1 deletion
Sim/Gauss/CMakeLists.txt
with
19 additions
and
11 deletions
Gen/LbEvtGen/CMakeLists.txt
+
18
−
10
View file @
e9f9bd4f
...
...
@@ -25,10 +25,9 @@ endif()
# Define EvtGen external project
include
(
ExternalProject
)
set
(
EVTGEN_GIT_SOURCE
"https://phab.hepforge.org/source/evtgen.git"
)
set
(
EVTGEN_GIT_TAG
"master"
)
#set(EVTGEN_GIT_TAG "modernize")
message
(
STATUS
"EvtGen will use HepForge repository"
)
set
(
EVTGEN_GIT_SOURCE
"https://phab.hepforge.org/source/evtgen.git"
CACHE STRING
"URL of the EvtGen git repository"
)
set
(
EVTGEN_GIT_TAG
"master"
CACHE STRING
"Tag of EvtGen to be used"
)
message
(
STATUS
"EvtGen will use tag
\"
${
EVTGEN_GIT_TAG
}
\"
from repository
${
EVTGEN_GIT_SOURCE
}
"
)
# Define external package locations required for HepForge EvtGen cmake scripts
string
(
REPLACE
"/include"
""
HEPMC2_ROOT_DIR
${
HEPMC_INCLUDE_DIR
}
)
...
...
@@ -36,9 +35,15 @@ string(REPLACE "/include" "" PYTHIA8_ROOT_DIR ${PYTHIA8_INCLUDE_DIR})
string
(
REPLACE
"/include"
""
PHOTOS++_ROOT_DIR
${
PHOTOS++_INCLUDE_DIR
}
)
string
(
REPLACE
"/include"
""
TAUOLA++_ROOT_DIR
${
TAUOLA++_INCLUDE_DIR
}
)
# Specify the Photos++ library components, which differ from v3.61 (assumed HepForge version)
# Photos v3.56:
set
(
PHOTOS++_FIND_COMPONENTS CxxInterface Fortran
)
# Specify the required library components for the external generators
# In particular, in Photos++ v3.56 the components differ from those in v3.61
# (which is the version assumed by default in the HepForge EvtGen cmake modules)
set
(
Pythia8_FIND_COMPONENTS pythia8 CACHE STRING
"Required components of Pythia8"
)
set
(
PHOTOS++_FIND_COMPONENTS CxxInterface Fortran CACHE STRING
"Required components of Photos++"
)
set
(
Tauola++_FIND_COMPONENTS CxxInterface Fortran CACHE STRING
"Required components of Tauola++"
)
# Pass on the Gaudi C++ Standard to the EvtGen build
string
(
REPLACE
"c++"
""
EVTGEN_CXX_STANDARD
${
GAUDI_CXX_STANDARD
}
)
ExternalProject_Add
(
EvtGenHepForge
GIT_REPOSITORY
${
EVTGEN_GIT_SOURCE
}
...
...
@@ -46,14 +51,17 @@ ExternalProject_Add(EvtGenHepForge
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=
${
CMAKE_INSTALL_PREFIX
}
-DHEPMC2_ROOT_DIR=
${
HEPMC2_ROOT_DIR
}
-DPYTHIA8_ROOT_DIR=
${
PYTHIA8_ROOT_DIR
}
-DPythia8_FIND_COMPONENTS=
${
Pythia8_FIND_COMPONENTS
}
-DPHOTOS++_ROOT_DIR=
${
PHOTOS++_ROOT_DIR
}
-DPHOTOS++_FIND_COMPONENTS=
${
PHOTOS++_FIND_COMPONENTS
}
-DTAUOLA++_ROOT_DIR=
${
TAUOLA++_ROOT_DIR
}
-DEVTGEN_PYTHIA=on
-DEVTGEN_PHOTOS=on
-DEVTGEN_TAUOLA=on
-DTauola++_FIND_COMPONENTS=
${
Tauola++_FIND_COMPONENTS
}
-DEVTGEN_PYTHIA=ON
-DEVTGEN_PHOTOS=ON
-DEVTGEN_TAUOLA=ON
-DCMAKE_CXX_COMPILER=
${
CMAKE_CXX_COMPILER
}
-DCMAKE_C_COMPILER=
${
CMAKE_C_COMPILER
}
-DCMAKE_CXX_STANDARD=
${
EVTGEN_CXX_STANDARD
}
CMAKE_COMMAND
${
env_cmd
}
${
CMAKE_COMMAND
}
)
...
...
This diff is collapsed.
Click to expand it.
Sim/Gauss/CMakeLists.txt
+
1
−
1
View file @
e9f9bd4f
...
...
@@ -14,7 +14,7 @@ gaudi_depends_on_subdirs(Det/DDDB
Kernel/KernelSys
Sim/SimComponents
Sim/GaussAlgs
Gen/LbEvtGen
Gen/LbEvtGen
Gen/LbPGuns
Gen/LbMIB
Gen/LbPythia
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment