From 975f4fbf8449acc471b3e49c492f4b860cb81899 Mon Sep 17 00:00:00 2001
From: Harmen Stoppels <me@harmenstoppels.nl>
Date: Tue, 10 Sep 2024 07:56:51 +0200
Subject: [PATCH] cmake: remove last occurrences of std_cmake_args globals
 (#46288)

---
 var/spack/repos/builtin/packages/apcomp/package.py        | 3 ++-
 var/spack/repos/builtin/packages/dray/package.py          | 8 +++++++-
 var/spack/repos/builtin/packages/kicad/package.py         | 3 +--
 .../repos/builtin/packages/rocm-openmp-extras/package.py  | 2 ++
 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 90c86f00968..87e1a8c16f2 100644
--- a/var/spack/repos/builtin/packages/apcomp/package.py
+++ b/var/spack/repos/builtin/packages/apcomp/package.py
@@ -9,6 +9,7 @@
 
 import llnl.util.tty as tty
 
+from spack.build_systems.cmake import CMakeBuilder
 from spack.package import *
 
 
@@ -65,7 +66,7 @@ def install(self, spec, prefix):
         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 1751e931052..9c0a38721de 100644
--- a/var/spack/repos/builtin/packages/dray/package.py
+++ b/var/spack/repos/builtin/packages/dray/package.py
@@ -8,6 +8,7 @@
 
 import llnl.util.tty as tty
 
+from spack.build_systems.cmake import CMakeBuilder
 from spack.package import *
 
 
@@ -120,7 +121,12 @@ def install(self, spec, prefix):
         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 be431d8a0ea..04ce3b555fc 100644
--- a/var/spack/repos/builtin/packages/kicad/package.py
+++ b/var/spack/repos/builtin/packages/kicad/package.py
@@ -130,6 +130,5 @@ def install_libraries(self):
         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 54402bdfc08..f6a97174625 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 @@ def install(self, spec, prefix):
 
         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: