From 58a897be0ec6fbd783a9d6193aaaaac86f4e4e60 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 20 Apr 2021 17:13:15 -0700 Subject: check for package in spec not variant (#23157) --- lib/spack/spack/build_systems/cached_cmake.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/build_systems/cached_cmake.py b/lib/spack/spack/build_systems/cached_cmake.py index 0704a4aa09..2c3e150528 100644 --- a/lib/spack/spack/build_systems/cached_cmake.py +++ b/lib/spack/spack/build_systems/cached_cmake.py @@ -128,7 +128,7 @@ class CachedCMakePackage(CMakePackage): def initconfig_mpi_entries(self): spec = self.spec - if "+mpi" not in spec: + if not spec.satisfies('^mpi'): return [] entries = [ @@ -194,7 +194,7 @@ class CachedCMakePackage(CMakePackage): "#------------------{0}\n".format("-" * 60), ] - if '+cuda' in spec: + if spec.satisfies('^cuda'): entries.append("#------------------{0}".format("-" * 30)) entries.append("# Cuda") entries.append("#------------------{0}\n".format("-" * 30)) @@ -206,7 +206,7 @@ class CachedCMakePackage(CMakePackage): entries.append(cmake_cache_path("CMAKE_CUDA_COMPILER", cudacompiler)) - if "+mpi" in spec: + if spec.satisfies('^mpi'): entries.append(cmake_cache_path("CMAKE_CUDA_HOST_COMPILER", "${MPI_CXX_COMPILER}")) else: -- cgit v1.2.3-70-g09d2