Skip to content
Snippets Groups Projects
Commit 7782e8c4 authored by Rosen Matev's avatar Rosen Matev :sunny:
Browse files

Adapt to merge of Phys into Rec

parent 6bc0f553
No related branches found
No related tags found
2 merge requests!1255Updating branch with respect to master,!1250Adapt to merge of Phys into Rec
Pipeline #3434770 passed with warnings
Stage: check
    Stage: build
      Stage: docs
        Stage: .post
          Hide whitespace changes
          Inline Side-by-side
          MooreCache/CMakeLists.txt
          + 4
          − 4
          View file @ 7782e8c4
          ...@@ -20,7 +20,7 @@ set(cache_deps ...@@ -20,7 +20,7 @@ set(cache_deps
          LHCb::LoKiCoreLib LHCb::LoKiCoreLib
          LHCb::PhysEvent LHCb::PhysEvent
          Rec::FunctorCoreLib # this should bring most dependencies indirectly Rec::FunctorCoreLib # this should bring most dependencies indirectly
          Phys::ParticleCombinersLib Rec::ParticleCombinersLib
          # TODO can we get this list automatically? # TODO can we get this list automatically?
          # TODO can we depend only on the headers and not the .so files? # TODO can we depend only on the headers and not the .so files?
          ) )
          ...@@ -76,9 +76,9 @@ foreach(options_path IN LISTS hlt2_settings) ...@@ -76,9 +76,9 @@ foreach(options_path IN LISTS hlt2_settings)
          Gaudi::GaudiKernel Gaudi::GaudiKernel
          LHCb::LoKiCoreLib LHCb::LoKiCoreLib
          LHCb::LoKiHltLib LHCb::LoKiHltLib
          Phys::DaVinciKernelLib Rec::DaVinciKernelLib
          Phys::LoKiArrayFunctorsLib Rec::LoKiArrayFunctorsLib
          Phys::LoKiPhysLib Rec::LoKiPhysLib
          Rec::FunctorCoreLib Rec::FunctorCoreLib
          Rec::LoKiTrackLib Rec::LoKiTrackLib
          DEPENDS ${cache_deps} DEPENDS ${cache_deps}
          ......
          cmake/MooreDependencies.cmake
          + 1
          − 1
          View file @ 7782e8c4
          ...@@ -22,7 +22,7 @@ if(NOT COMMAND lhcb_find_package) ...@@ -22,7 +22,7 @@ if(NOT COMMAND lhcb_find_package)
          endif() endif()
          # -- Public dependencies # -- 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) lhcb_find_package(Allen REQUIRED)
          # Allen uses old-style CMake configuration # Allen uses old-style CMake configuration
          ......
          lhcbproject.yml
          + 0
          − 1
          View file @ 7782e8c4
          ...@@ -2,5 +2,4 @@ ...@@ -2,5 +2,4 @@
          name: Moore name: Moore
          license: GPL-3.0-only license: GPL-3.0-only
          dependencies: dependencies:
          - Phys
          - Allen - Allen
          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