zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: remove last occurrences of std_cmake_args globals (#46288)

Browse Source
This commit is contained in:
Harmen Stoppels 2024-09-10 07:56:51 +02:00 committed by GitHub
parent dc853b2cf4
commit 975f4fbf84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/repos/builtin/packages/apcomp/package.py
View File

@ -9,6 +9,7 @@
import llnl.util.tty as tty import llnl.util.tty as tty
from spack.build_systems.cmake import CMakeBuilder
from spack.package import * from spack.package import *
@ -65,7 +66,7 @@ def install(self, spec, prefix):
with working_dir("spack-build", create=True): with working_dir("spack-build", create=True):
host_cfg_fname = self.create_host_config(spec, prefix) host_cfg_fname = self.create_host_config(spec, prefix)
print("Configuring APComp...") 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...") print("Building APComp...")
make() make()
print("Installing APComp...") print("Installing APComp...")

8
var/spack/repos/builtin/packages/dray/package.py
View File

@ -8,6 +8,7 @@
import llnl.util.tty as tty import llnl.util.tty as tty
from spack.build_systems.cmake import CMakeBuilder
from spack.package import * from spack.package import *
@ -120,7 +121,12 @@ def install(self, spec, prefix):
with working_dir("spack-build", create=True): with working_dir("spack-build", create=True):
host_cfg_fname = self.create_host_config(spec, prefix) host_cfg_fname = self.create_host_config(spec, prefix)
print("Configuring Devil Ray...") 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...") print("Building Devil Ray...")
make() make()
# run unit tests if requested # run unit tests if requested

3
var/spack/repos/builtin/packages/kicad/package.py
View File

@ -130,6 +130,5 @@ def install_libraries(self):
for ver, lib, checksum in self.resource_list: for ver, lib, checksum in self.resource_list:
if self.spec.version == Version(ver): if self.spec.version == Version(ver):
with working_dir("kicad-{0}-{1}".format(lib, ver)): with working_dir("kicad-{0}-{1}".format(lib, ver)):
args = std_cmake_args cmake(*self.std_cmake_args)
cmake(*args)
make("install") make("install")

2
var/spack/repos/builtin/packages/rocm-openmp-extras/package.py
View File

@ -6,6 +6,7 @@
import os import os
import re import re
from spack.build_systems.cmake import CMakeBuilder
from spack.package import * from spack.package import *
tools_url = "https://github.com/ROCm" tools_url = "https://github.com/ROCm"
@ -643,6 +644,7 @@ def install(self, spec, prefix):
build_order += ["pgmath", "flang", "flang-runtime"] build_order += ["pgmath", "flang", "flang-runtime"]
# Override standard CMAKE_BUILD_TYPE # Override standard CMAKE_BUILD_TYPE
std_cmake_args = CMakeBuilder.std_args(self, generator="Unix Makefiles")
for arg in std_cmake_args: for arg in std_cmake_args:
found = re.search("CMAKE_BUILD_TYPE", arg) found = re.search("CMAKE_BUILD_TYPE", arg)
if found: if found: