Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Moore
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
LHCb
Moore
Commits
7782e8c4
Commit
7782e8c4
authored
3 years ago
by
Rosen Matev
Browse files
Options
Downloads
Patches
Plain Diff
Adapt to merge of Phys into Rec
parent
6bc0f553
No related branches found
No related tags found
2 merge requests
!1255
Updating branch with respect to master
,
!1250
Adapt to merge of Phys into Rec
Pipeline
#3434770
passed with warnings
3 years ago
Stage: check
Stage: build
Stage: docs
Stage: .post
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
MooreCache/CMakeLists.txt
+4
-4
4 additions, 4 deletions
MooreCache/CMakeLists.txt
cmake/MooreDependencies.cmake
+1
-1
1 addition, 1 deletion
cmake/MooreDependencies.cmake
lhcbproject.yml
+0
-1
0 additions, 1 deletion
lhcbproject.yml
with
5 additions
and
6 deletions
MooreCache/CMakeLists.txt
+
4
−
4
View file @
7782e8c4
...
...
@@ -20,7 +20,7 @@ set(cache_deps
LHCb::LoKiCoreLib
LHCb::PhysEvent
Rec::FunctorCoreLib
# this should bring most dependencies indirectly
Phys
::ParticleCombinersLib
Rec
::ParticleCombinersLib
# TODO can we get this list automatically?
# TODO can we depend only on the headers and not the .so files?
)
...
...
@@ -76,9 +76,9 @@ foreach(options_path IN LISTS hlt2_settings)
Gaudi::GaudiKernel
LHCb::LoKiCoreLib
LHCb::LoKiHltLib
Phys
::DaVinciKernelLib
Phys
::LoKiArrayFunctorsLib
Phys
::LoKiPhysLib
Rec
::DaVinciKernelLib
Rec
::LoKiArrayFunctorsLib
Rec
::LoKiPhysLib
Rec::FunctorCoreLib
Rec::LoKiTrackLib
DEPENDS
${
cache_deps
}
...
...
This diff is collapsed.
Click to expand it.
cmake/MooreDependencies.cmake
+
1
−
1
View file @
7782e8c4
...
...
@@ -22,7 +22,7 @@ if(NOT COMMAND lhcb_find_package)
endif
()
# -- Public dependencies
lhcb_find_package
(
Phys
REQUIRED
)
lhcb_find_package
(
Rec
REQUIRED
)
# FIXME keep this until Allen migrates to new CMake
lhcb_find_package
(
Allen REQUIRED
)
# Allen uses old-style CMake configuration
...
...
This diff is collapsed.
Click to expand it.
lhcbproject.yml
+
0
−
1
View file @
7782e8c4
...
...
@@ -2,5 +2,4 @@
name
:
Moore
license
:
GPL-3.0-only
dependencies
:
-
Phys
-
Allen
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