diff options
| author | Harmen Stoppels <me@harmenstoppels.nl> | 2024-09-10 07:56:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-10 07:56:51 +0200 |
| commit | 975f4fbf8449acc471b3e49c492f4b860cb81899 (patch) | |
| tree | 1d5a549caa17b2a561be8c9c32a534346998541e /var | |
| parent | dc853b2cf411a245d8611284a7cca84c57f96327 (diff) | |
| download | spack-975f4fbf8449acc471b3e49c492f4b860cb81899.tar.gz spack-975f4fbf8449acc471b3e49c492f4b860cb81899.tar.bz2 spack-975f4fbf8449acc471b3e49c492f4b860cb81899.tar.xz spack-975f4fbf8449acc471b3e49c492f4b860cb81899.zip | |
cmake: remove last occurrences of std_cmake_args globals (#46288)
Diffstat (limited to 'var')
4 files changed, 12 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/apcomp/package.py b/var/spack/repos/builtin/packages/apcomp/package.py index 90c86f0096..87e1a8c16f 100644 --- a/var/spack/repos/builtin/packages/apcomp/package.py +++ b/var/spack/repos/builtin/packages/apcomp/package.py @@ -9,6 +9,7 @@ import socket import llnl.util.tty as tty +from spack.build_systems.cmake import CMakeBuilder from spack.package import * @@ -65,7 +66,7 @@ class Apcomp(Package): with working_dir("spack-build", create=True): host_cfg_fname = self.create_host_config(spec, prefix) print("Configuring APComp...") - cmake(*std_cmake_args, "-C", host_cfg_fname, "../src") + cmake(*CMakeBuilder.std_args(self), "-C", host_cfg_fname, "../src") print("Building APComp...") make() print("Installing APComp...") diff --git a/var/spack/repos/builtin/packages/dray/package.py b/var/spack/repos/builtin/packages/dray/package.py index 1751e93105..9c0a38721d 100644 --- a/var/spack/repos/builtin/packages/dray/package.py +++ b/var/spack/repos/builtin/packages/dray/package.py @@ -8,6 +8,7 @@ import socket import llnl.util.tty as tty +from spack.build_systems.cmake import CMakeBuilder from spack.package import * @@ -120,7 +121,12 @@ class Dray(Package, CudaPackage): with working_dir("spack-build", create=True): host_cfg_fname = self.create_host_config(spec, prefix) print("Configuring Devil Ray...") - cmake(*std_cmake_args, "-C", host_cfg_fname, "../src") + cmake( + *CMakeBuilder.std_args(self, generator="Unix Makefiles"), + "-C", + host_cfg_fname, + "../src", + ) print("Building Devil Ray...") make() # run unit tests if requested diff --git a/var/spack/repos/builtin/packages/kicad/package.py b/var/spack/repos/builtin/packages/kicad/package.py index be431d8a0e..04ce3b555f 100644 --- a/var/spack/repos/builtin/packages/kicad/package.py +++ b/var/spack/repos/builtin/packages/kicad/package.py @@ -130,6 +130,5 @@ class Kicad(CMakePackage): for ver, lib, checksum in self.resource_list: if self.spec.version == Version(ver): with working_dir("kicad-{0}-{1}".format(lib, ver)): - args = std_cmake_args - cmake(*args) + cmake(*self.std_cmake_args) make("install") diff --git a/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py b/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py index 54402bdfc0..f6a9717462 100644 --- a/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py +++ b/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py @@ -6,6 +6,7 @@ import os import re +from spack.build_systems.cmake import CMakeBuilder from spack.package import * tools_url = "https://github.com/ROCm" @@ -643,6 +644,7 @@ class RocmOpenmpExtras(Package): build_order += ["pgmath", "flang", "flang-runtime"] # Override standard CMAKE_BUILD_TYPE + std_cmake_args = CMakeBuilder.std_args(self, generator="Unix Makefiles") for arg in std_cmake_args: found = re.search("CMAKE_BUILD_TYPE", arg) if found: |