diff options
| author | Nils Vu <owls@nilsvu.de> | 2023-10-12 19:13:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-12 20:13:01 -0600 |
| commit | fb1d0f60d932b29dd419cd964cad076f0b148a93 (patch) | |
| tree | f0d92e242b202d366781e11eca1320f8cbb9d372 | |
| parent | 728eaa515f02f0e6153ed485c8fcf681606ff4d8 (diff) | |
| download | spack-fb1d0f60d932b29dd419cd964cad076f0b148a93.tar.gz spack-fb1d0f60d932b29dd419cd964cad076f0b148a93.tar.bz2 spack-fb1d0f60d932b29dd419cd964cad076f0b148a93.tar.xz spack-fb1d0f60d932b29dd419cd964cad076f0b148a93.zip | |
catch2: add +pic and +shared options (#40337)
Also add latest version
| -rw-r--r-- | var/spack/repos/builtin/packages/catch2/package.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/catch2/package.py b/var/spack/repos/builtin/packages/catch2/package.py index bb731a43f1..82eb629bb8 100644 --- a/var/spack/repos/builtin/packages/catch2/package.py +++ b/var/spack/repos/builtin/packages/catch2/package.py @@ -19,6 +19,7 @@ class Catch2(CMakePackage): version("develop", branch="devel") # Releases + version("3.4.0", sha256="122928b814b75717316c71af69bd2b43387643ba076a6ec16e7882bfb2dfacbb") version("3.3.2", sha256="8361907f4d9bff3ae7c1edb027f813659f793053c99b67837a0c0375f065bae2") version("3.3.1", sha256="d90351cdc55421f640c553cfc0875a8c834428679444e8062e9187d05b18aace") version("3.3.0", sha256="fe2f29a54ca775c2dd04bb97ffb79d398e6210e3caa174348b5cd3b7e4ca887d") @@ -104,6 +105,11 @@ class Catch2(CMakePackage): version("1.3.5", sha256="f15730d81b4173fb860ce3561768de7d41bbefb67dc031d7d1f5ae2c07f0a472") version("1.3.0", sha256="245f6ee73e2fea66311afa1da59e5087ddab8b37ce64994ad88506e8af28c6ac") + variant( + "pic", when="@3: ~shared", default=True, description="Build with position-independent code" + ) + variant("shared", when="@3:", default=False, description="Build shared library") + def cmake_args(self): spec = self.spec args = [] @@ -112,6 +118,10 @@ class Catch2(CMakePackage): args.append("-DNO_SELFTEST={0}".format("OFF" if self.run_tests else "ON")) elif spec.satisfies("@2.1.1:"): args.append(self.define("BUILD_TESTING", self.run_tests)) + if spec.satisfies("@3:"): + args.append(self.define_from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic")) + args.append(self.define_from_variant("BUILD_SHARED_LIBS", "shared")) + return args @when("@:1.6") |