diff options
| author | Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com> | 2024-02-27 08:34:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-27 08:34:42 +0100 |
| commit | d8c2782949b109c77c862df0861ba6f088342ea0 (patch) | |
| tree | becce04eb5a127099df7e759c68d63230989bf99 | |
| parent | 6dde6ca887b5cf035f9c4cda87d26f3e4b8ff91b (diff) | |
| download | spack-d8c2782949b109c77c862df0861ba6f088342ea0.tar.gz spack-d8c2782949b109c77c862df0861ba6f088342ea0.tar.bz2 spack-d8c2782949b109c77c862df0861ba6f088342ea0.tar.xz spack-d8c2782949b109c77c862df0861ba6f088342ea0.zip | |
bdsim: use the same C++ standard as in ROOT, add a patch (#42031)
Co-authored-by: jmcarcell <jmcarcell@users.noreply.github.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/bdsim/c++-standard.patch | 13 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/bdsim/package.py | 11 |
2 files changed, 23 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/bdsim/c++-standard.patch b/var/spack/repos/builtin/packages/bdsim/c++-standard.patch new file mode 100644 index 0000000000..58dabf5cb2 --- /dev/null +++ b/var/spack/repos/builtin/packages/bdsim/c++-standard.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4750d9a..7b10b57 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,7 +5,7 @@ if (CMAKE_VERSION VERSION_LESS 3.9.0) + cmake_policy(SET CMP0042 OLD) + endif() + +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 11 CACHE STRING "") + set(CMAKE_CXX_STANDARD_REQUIRED ON) + + include(GenerateExportHeader) diff --git a/var/spack/repos/builtin/packages/bdsim/package.py b/var/spack/repos/builtin/packages/bdsim/package.py index 61eddbc92d..656fde32ce 100644 --- a/var/spack/repos/builtin/packages/bdsim/package.py +++ b/var/spack/repos/builtin/packages/bdsim/package.py @@ -22,7 +22,9 @@ class Bdsim(CMakePackage): license("GPL-3.0-or-later") - version("develop", branch="develop") + version("master", branch="master") + version("1.7.6", sha256="92f53aa0a9fbd3cafd218f9e58ae4d1e7115733e641191c1658243fefb436600") + version("1.7.0", sha256="713ce3c9d94f340ca774ce1803e0c4f992b904dbc28ce4129713abe883e98683") version("1.6.0", sha256="e3241d2d097cb4e22249e315c1474da9b3657b9c6893232d9f9e543a5323f717") depends_on("cmake") @@ -32,3 +34,10 @@ class Bdsim(CMakePackage): depends_on("clhep") depends_on("flex") depends_on("bison") + + patch("c++-standard.patch", when="@:1.7.6") + + def cmake_args(self): + args = [] + args.append(f"-DCMAKE_CXX_STANDARD={self.spec['root'].variants['cxxstd'].value}") + return args |