From 875397cf16173bbae8c4cc2c9c50116d4d6983a9 Mon Sep 17 00:00:00 2001 From: Rao Garimella Date: Fri, 18 Apr 2025 00:54:11 -0600 Subject: [PATCH] r3d: add the shared variant (#49953) --- var/spack/repos/builtin/packages/r3d/package.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/r3d/package.py b/var/spack/repos/builtin/packages/r3d/package.py index f6a1e08b2b2..a41551aa7c5 100644 --- a/var/spack/repos/builtin/packages/r3d/package.py +++ b/var/spack/repos/builtin/packages/r3d/package.py @@ -35,6 +35,8 @@ class R3d(CMakePackage): description="Build R3D regression tests (versions 2019-04-24 or earlier)", ) + variant("shared", default=False, description="Build shared libraries") + variant( "pic", default=False, description="Produce position-independent code (for shared libs)" ) @@ -42,6 +44,8 @@ class R3d(CMakePackage): depends_on("c", type="build") # generated depends_on("cxx", type="build") # generated + conflicts("+shared ~pic") + @when("@:2019-04-24") def cmake(self, spec, prefix): pass @@ -81,11 +85,12 @@ def cmake_args(self): if r3d_max_verts != "0": options.append("-DR3D_MAX_VERTS=" + r3d_max_verts) + options.append(self.define_from_variant("BUILD_SHARED_LIBS", "shared")) + options.append(self.define_from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic")) + if self.run_tests: options.append("-DENABLE_UNIT_TESTS=ON") else: options.append("-DENABLE_UNIT_TESTS=OFF") - options.append(self.define_from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic")) - return options