zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pandora{pfa,sdk,monitoring}: add new versions and allow setting the C++ standard (#48300)

Browse Source 
* pandoramonitoring: add v3.6.0; pandorapfa: add v4.11.2

Remove variables that are not being used in pandorasdk. Use the C++ standard
from ROOT when possible and pass -Wno-error to override the -Werror that will
typically fail with a new standard. Add a cxxstd variant for pandorasdk

* Fix style

* Update var/spack/repos/builtin/packages/pandorasdk/package.py

Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>

* Fix style

---------

Co-authored-by: jmcarcell <jmcarcell@users.noreply.github.com>
Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
This commit is contained in:
Juan Miguel Carceller 2025-02-14 00:09:40 +01:00 committed by GitHub
parent 3fe13f0891
commit e34f04df5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
var/spack/repos/builtin/packages/pandoramonitoring/package.py
View File

@ -19,6 +19,7 @@ class Pandoramonitoring(CMakePackage):
maintainers("jmcarcell", "wdconinc")
version("master", branch="master")
version("3.6.0", sha256="5fc9574faa3e90d96e5d2a27dea46b55f844499cf21e39060acb1e4c080dec77")
version("3.5.0", sha256="274562abb7c797194634d5460a56227444a1de07a240c88ae35ca806abcbaf60")
depends_on("c", type="build")
@ -39,7 +40,8 @@ def patch(self):
def cmake_args(self):
args = [
self.define("CMAKE_MODULE_PATH", self.spec["pandorapfa"].prefix.cmakemodules),
self.define("CMAKE_CXX_FLAGS", "-std=c++17"),
self.define("CMAKE_CXX_FLAGS", "-Wno-error"),
self.define("CMAKE_CXX_STANDARD", self.spec["root"].variants["cxxstd"].value),
]
return args

1
var/spack/repos/builtin/packages/pandorapfa/package.py
View File

@ -20,6 +20,7 @@ class Pandorapfa(Package):
maintainers("jmcarcell", "wdconinc")
version("master", branch="master")
version("4.11.2", sha256="02b0e8c1844ec515055cb85f9d14d9d13eda28607c634611a59d767eb08a8b34")
version("4.3.1", sha256="2f4757a6ed2e10d3effc300b330f67ba13c499dbf21ba720b29b50527332fcdb")
version("4.3.0", sha256="a794022c33b3a5afc1272740ac385e0c4ab96a112733012e7dfcbe80b5a3b445")
version("4.2.1", sha256="1d262417748d18e00466ae3f1714ab0d7452e903bd1430773a72c652cf4666e4")

13
var/spack/repos/builtin/packages/pandorasdk/package.py
View File

@ -22,6 +22,14 @@ class Pandorasdk(CMakePackage):
version("3.4.1", sha256="9607bf52a9d79d88d28c45d4f3336e066338b36ab81b4d2d125226f4ad3a7aaf")
version("3.4.0", sha256="1e30db056d4a43f8659fccdda00270af14593425d933f91e91d5c97f1e124c6b")
variant(
"cxxstd",
default="17",
values=("17", "20"),
multi=False,
description="Use the specified C++ standard when building.",
)
depends_on("c", type="build")
depends_on("cxx", type="build")
@ -29,10 +37,9 @@ class Pandorasdk(CMakePackage):
def cmake_args(self):
args = [
self.define("LC_PANDORA_CONTENT", True),
self.define("LAR_PANDORA_CONTENT", True),
self.define("CMAKE_MODULE_PATH", self.spec["pandorapfa"].prefix.cmakemodules),
self.define("CMAKE_CXX_FLAGS", "-std=c++17"),
self.define("CMAKE_CXX_FLAGS", "-Wno-error"),
self.define("CMAKE_CXX_STANDARD", self.spec.variants["cxxstd"].value),
]
return args