From d6124b31f2baba5cac38158ff30e115e140ce01b Mon Sep 17 00:00:00 2001 From: Marco Clemencic Date: Mon, 27 Sep 2021 17:46:44 +0200 Subject: [PATCH] Minor CMake configuration fixes --- Phys/JetAccessories/CMakeLists.txt | 1 + Phys/LoKiAlgo/CMakeLists.txt | 2 +- cmake/PhysDependencies.cmake | 6 +----- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Phys/JetAccessories/CMakeLists.txt b/Phys/JetAccessories/CMakeLists.txt index 439084d55..b335a55d5 100644 --- a/Phys/JetAccessories/CMakeLists.txt +++ b/Phys/JetAccessories/CMakeLists.txt @@ -51,6 +51,7 @@ gaudi_add_module(JetAccessories LHCb::CaloUtils LHCb::DetDescLib LHCb::DigiEvent + LHCb::LHCbAlgsLib LHCb::LHCbKernel LHCb::LHCbMathLib LHCb::LoKiCoreLib diff --git a/Phys/LoKiAlgo/CMakeLists.txt b/Phys/LoKiAlgo/CMakeLists.txt index c2894adee..3302ddd5b 100644 --- a/Phys/LoKiAlgo/CMakeLists.txt +++ b/Phys/LoKiAlgo/CMakeLists.txt @@ -29,6 +29,7 @@ gaudi_add_library(LoKiAlgo Gaudi::GaudiAlgLib Gaudi::GaudiKernel Gaudi::GaudiPythonLib + LHCb::DAQEventLib LHCb::LoKiCoreLib LHCb::PartPropLib LHCb::PhysEvent @@ -38,7 +39,6 @@ gaudi_add_library(LoKiAlgo Phys::DaVinciTypesLib Phys::LoKiPhysLib PRIVATE - LHCb::DAQEventLib LHCb::LHCbKernel ) diff --git a/cmake/PhysDependencies.cmake b/cmake/PhysDependencies.cmake index c4321aee1..c7cfd0804 100644 --- a/cmake/PhysDependencies.cmake +++ b/cmake/PhysDependencies.cmake @@ -43,6 +43,7 @@ if(WITH_Phys_PRIVATE_DEPENDENCIES) find_package(CLHEP REQUIRED) find_package(FastJet REQUIRED) find_package(GSL REQUIRED) + find_package(Python REQUIRED Development Interpreter) find_package(ROOT 6.20 REQUIRED Core MathCore @@ -51,11 +52,6 @@ if(WITH_Phys_PRIVATE_DEPENDENCIES) ) find_package(VDT REQUIRED) - if(NOT TARGET Python::Python) - # FIXME we should look for Python from this project - message(FATAL_ERROR "target Python::Python missing (expected from LHCb)") - endif() - if(BUILD_TESTING) find_package(BLAS REQUIRED) endif() -- GitLab