From ebc24b7063ba9a8eb43b4424aac5143cf958d76f Mon Sep 17 00:00:00 2001 From: Thomas Madlener Date: Tue, 21 Feb 2023 06:33:11 +0100 Subject: [PATCH] dd4hep: extend conflict on CMake (#27125) --- var/spack/repos/builtin/packages/dd4hep/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/dd4hep/package.py b/var/spack/repos/builtin/packages/dd4hep/package.py index f5129b7e89..83ae977b89 100644 --- a/var/spack/repos/builtin/packages/dd4hep/package.py +++ b/var/spack/repos/builtin/packages/dd4hep/package.py @@ -156,10 +156,10 @@ class Dd4hep(CMakePackage): depends_on("podio@0.16:", when="@1.24: +edm4hep") depends_on("py-pytest", type=("build", "test")) - # See https://github.com/AIDASoft/DD4hep/pull/771 + # See https://github.com/AIDASoft/DD4hep/pull/771 and https://github.com/AIDASoft/DD4hep/pull/876 conflicts( - "^cmake@3.16:3.17.0", - when="@1.15", + "^cmake@3.16:3.17.2", + when="@1.15:1.18", msg="cmake version with buggy FindPython breaks dd4hep cmake config", ) conflicts("~ddrec+dddetectors", msg="Need to enable +ddrec to build +dddetectors.")