From 5f99d3dfaaac47ffff1cb48be1328de5746ab618 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Thu, 27 Oct 2022 09:13:07 -0700 Subject: spdlog: allow using vendored fmt library (#33379) --- var/spack/repos/builtin/packages/spdlog/package.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/spdlog/package.py b/var/spack/repos/builtin/packages/spdlog/package.py index bf411c3683..e449d853d2 100644 --- a/var/spack/repos/builtin/packages/spdlog/package.py +++ b/var/spack/repos/builtin/packages/spdlog/package.py @@ -45,13 +45,18 @@ class Spdlog(CMakePackage): version("0.9.0", sha256="bbbe5a855c8b309621352921d650449eb2f741d35d55ec50fb4d8122ddfb8f01") variant("shared", default=True, description="Build shared libraries (v1.4.0+)") + variant( + "fmt_external", + default=False, + description="Build using external fmt libraries instead of bundled one", + ) depends_on("cmake@3.2:", when="@:1.7.0", type="build") depends_on("cmake@3.10:", when="@1.8.0:", type="build") - depends_on("fmt@5.3:") - depends_on("fmt@7:", when="@1.7:") - depends_on("fmt@8:", when="@1.9:") + depends_on("fmt@5.3:", when="+fmt_external") + depends_on("fmt@7:", when="@1.7: +fmt_external") + depends_on("fmt@8:", when="@1.9: +fmt_external") def cmake_args(self): args = [] @@ -60,7 +65,7 @@ class Spdlog(CMakePackage): args.extend( [ self.define_from_variant("SPDLOG_BUILD_SHARED", "shared"), - self.define("SPDLOG_FMT_EXTERNAL", "ON"), + self.define_from_variant("SPDLOG_FMT_EXTERNAL", "fmt_external"), # tests and examples self.define("SPDLOG_BUILD_TESTS", self.run_tests), self.define("SPDLOG_BUILD_EXAMPLE", self.run_tests), -- cgit v1.2.3-70-g09d2