Rename api and return args

Author: kwryankrattiger

repos/spack_repo/builtin/build_systems/cmake.py

@@ -45,7 +45,7 @@ def _extract_primary_generator(generator):
 def _dependencies_cmake_extra_args(pkg: PackageBase, args: List[str]) -> None:
     for dep in pkg.spec.dependencies(deptype=("build", "link")):
         try:
-            dep.package.set_dependent_cmake_args(pkg, args)
+            args.extend(dep.package.dependent_cmake_args(pkg, args))
         except Exception:
             continue
 

repos/spack_repo/builtin/packages/mesa/package.py

@@ -176,8 +176,8 @@ def flag_handler(self, name, flags):
                 flags.append("-std=c99")
         return super().flag_handler(name, flags)
 
-    def set_dependent_cmake_args(self, pkg: PackageBase, args: List[str]):
-        args.append("-DOpenGL_GL_PREFERENCE:STRING=LEGACY")
+    def dependent_cmake_args(self, pkg: PackageBase) -> List[str]:
+        return ["-DOpenGL_GL_PREFERENCE:STRING=LEGACY"]
 
     @property
     def libglx_headers(self):

repos/spack_repo/builtin/packages/mpi/package.py

@@ -15,10 +15,11 @@ class Mpi(Package):
     homepage = "https://www.mpi-forum.org/"
     virtual = True
 
-    def set_dependent_cmake_args(self, pkg: PackageBase, args: List[str]) -> None:
+    def dependent_cmake_args(self, pkg: PackageBase) -> List[str]:
         if not getattr(pkg, "find_mpi_hints", False):
-            return
+            return []
 
+        args = []
         if "c" in pkg.spec:
             args.append(pkg.define("MPI_C_COMPILER", pkg.spec["mpi"].mpicc))
         if "cxx" in pkg.spec:
@@ -29,6 +30,8 @@ def set_dependent_cmake_args(self, pkg: PackageBase, args: List[str]) -> None:
             else:
                 args.append(pkg.define("MPI_Fortran_COMPILER", pkg.spec["mpi"].mpifc))
 
+        return args
+
     def test_mpi_hello(self):
         """build and run mpi hello world"""
         for lang in ("c", "f"):

repos/spack_repo/builtin/packages/python/package.py

@@ -1296,7 +1296,7 @@ def setup_dependent_package(self, module, dependent_spec):
         module.python_platlib = join_path(dependent_spec.prefix, self.platlib)
         module.python_purelib = join_path(dependent_spec.prefix, self.purelib)
 
-    def set_dependent_cmake_args(self, pkg: PackageBase, args: List[str]) -> None:
+    def dependent_cmake_args(self, pkg: PackageBase) -> List[str]:
         """Set the {Python3,Python,PYTHON}_EXECUTABLE CMake variables explicitly if the package
         has the variable ``find_python_hints`` set to True. This ensures that CMake locates the
         right Python in its builtin FindPython3, FindPython, and FindPythonInterp modules.
@@ -1307,16 +1307,14 @@ def set_dependent_cmake_args(self, pkg: PackageBase, args: List[str]) -> None:
         # Allow packages to disable these hints be setting a the member variable
         # ``find_python_hints`` to False. By default this is always applied.
         if not getattr(pkg, "find_python_hints", True):
-            return
+            return []
 
         python_executable = pkg.spec["python"].command.path
-        args.extend(
-            [
-                define("PYTHON_EXECUTABLE", python_executable),
-                define("Python_EXECUTABLE", python_executable),
-                define("Python3_EXECUTABLE", python_executable),
-            ]
-        )
+        return [
+            define("PYTHON_EXECUTABLE", python_executable),
+            define("Python_EXECUTABLE", python_executable),
+            define("Python3_EXECUTABLE", python_executable),
+        ]
 
     def add_files_to_view(self, view, merge_map, skip_if_exists=True):
         """Make the view a virtual environment if it isn't one already.