From bf14b424bb589558ef03e46627ef53eb31afc891 Mon Sep 17 00:00:00 2001 From: "John W. Parent" <45471568+johnwparent@users.noreply.github.com> Date: Sat, 9 Mar 2024 02:40:27 -0500 Subject: [PATCH] proj: correct CMake arg for shared build with proj older than 7.0.0 (#43089) * proj: correct CMake arg for shared build with proj older than 7.0.0 * Actually use new CMake arg * Update var/spack/repos/builtin/packages/proj/package.py Co-authored-by: Adam J. Stewart --------- Co-authored-by: Adam J. Stewart --- var/spack/repos/builtin/packages/proj/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/proj/package.py b/var/spack/repos/builtin/packages/proj/package.py index fd876713cd6..ef18d834dcb 100644 --- a/var/spack/repos/builtin/packages/proj/package.py +++ b/var/spack/repos/builtin/packages/proj/package.py @@ -128,10 +128,11 @@ def install_datum_grids(self): class CMakeBuilder(BaseBuilder, cmake.CMakeBuilder): def cmake_args(self): + shared_arg = "BUILD_SHARED_LIBS" if self.spec.satisfies("@7:") else "BUILD_LIBPROJ_SHARED" args = [ self.define_from_variant("ENABLE_TIFF", "tiff"), self.define_from_variant("ENABLE_CURL", "curl"), - self.define_from_variant("BUILD_SHARED_LIBS", "shared"), + self.define_from_variant(shared_arg, "shared"), self.define_from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic"), ] if self.spec.satisfies("@6:") and self.pkg.run_tests: