diff options
16 files changed, 40 insertions, 48 deletions
diff --git a/var/spack/repos/builtin/packages/amr-wind/package.py b/var/spack/repos/builtin/packages/amr-wind/package.py index ea390b3d05..b2b91d7b6f 100644 --- a/var/spack/repos/builtin/packages/amr-wind/package.py +++ b/var/spack/repos/builtin/packages/amr-wind/package.py @@ -60,7 +60,7 @@ class AmrWind(CMakePackage, CudaPackage, ROCmPackage): env.append_flags("CXXFLAGS", "-no-ipo") def cmake_args(self): - define = CMakePackage.define + define = self.define vs = [ "mpi", diff --git a/var/spack/repos/builtin/packages/frontistr/package.py b/var/spack/repos/builtin/packages/frontistr/package.py index 2444f196ee..2ed15bac69 100644 --- a/var/spack/repos/builtin/packages/frontistr/package.py +++ b/var/spack/repos/builtin/packages/frontistr/package.py @@ -29,7 +29,7 @@ class FrontistrBase(CMakePackage): depends_on("trilinos@:12.18.1") def cmake_args(self): - define = CMakePackage.define + define = self.define cmake_args = [ define("WITH_ML", True), define("REFINER_INCLUDE_PATH", self.spec["revocap-refiner"].prefix.include), diff --git a/var/spack/repos/builtin/packages/fujitsu-frontistr/package.py b/var/spack/repos/builtin/packages/fujitsu-frontistr/package.py index f070b3fe4d..7dac8b20fb 100644 --- a/var/spack/repos/builtin/packages/fujitsu-frontistr/package.py +++ b/var/spack/repos/builtin/packages/fujitsu-frontistr/package.py @@ -31,7 +31,7 @@ class FujitsuFrontistr(FrontistrBase): return url.format(version) def cmake_args(self): - define = CMakePackage.define + define = self.define args = super(FujitsuFrontistr, self).cmake_args() if self.spec.satisfies("%fj"): args.extend( diff --git a/var/spack/repos/builtin/packages/itk/package.py b/var/spack/repos/builtin/packages/itk/package.py index edeb208d33..64c95272dc 100644 --- a/var/spack/repos/builtin/packages/itk/package.py +++ b/var/spack/repos/builtin/packages/itk/package.py @@ -65,26 +65,23 @@ class Itk(CMakePackage): depends_on("zlib") def cmake_args(self): - force = CMakePackage.define - from_variant = self.define_from_variant use_mkl = "^mkl" in self.spec - args = [ - force("BUILD_SHARED_LIBS", True), - force("ITK_USE_SYSTEM_LIBRARIES", True), - force("ITK_USE_MKL", use_mkl), - from_variant("Module_ITKReview", "review"), - from_variant("Module_RTK", "rtk"), - from_variant("Module_ITKIOMINC", "minc"), - from_variant("Module_ITKIOTransformMINC", "minc"), + self.define("BUILD_SHARED_LIBS", True), + self.define("ITK_USE_SYSTEM_LIBRARIES", True), + self.define("ITK_USE_MKL", use_mkl), + self.define_from_variant("Module_ITKReview", "review"), + self.define_from_variant("Module_RTK", "rtk"), + self.define_from_variant("Module_ITKIOMINC", "minc"), + self.define_from_variant("Module_ITKIOTransformMINC", "minc"), ] if not use_mkl: args.extend( [ - force("USE_FFTWD", True), - force("USE_FFTWF", True), - force("USE_SYSTEM_FFTW", True), + self.define("USE_FFTWD", True), + self.define("USE_FFTWF", True), + self.define("USE_SYSTEM_FFTW", True), ] ) diff --git a/var/spack/repos/builtin/packages/libproxy/package.py b/var/spack/repos/builtin/packages/libproxy/package.py index f4b3156204..84c1123683 100644 --- a/var/spack/repos/builtin/packages/libproxy/package.py +++ b/var/spack/repos/builtin/packages/libproxy/package.py @@ -28,11 +28,10 @@ class Libproxy(CMakePackage): depends_on("python@:3.6", type=("build", "run"), when="@:0.4.15 +python") def cmake_args(self): - from_variant = self.define_from_variant return [ - from_variant("WITH_PERL", "perl"), - from_variant("WITH_PYTHON3", "python"), - CMakePackage.define("WITH_DOTNET", False), - CMakePackage.define("WITH_PYTHON2", False), - CMakePackage.define("WITH_VALA", False), + self.define_from_variant("WITH_PERL", "perl"), + self.define_from_variant("WITH_PYTHON3", "python"), + self.define("WITH_DOTNET", False), + self.define("WITH_PYTHON2", False), + self.define("WITH_VALA", False), ] diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py index 7f761261ab..f6192e6080 100644 --- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py @@ -255,7 +255,7 @@ class LlvmAmdgpu(CMakePackage): # bootstraping the libcxx with the just built clang if self.spec.satisfies("@4.5.0:"): spec = self.spec - define = CMakePackage.define + define = self.define libcxxdir = "build-bootstrapped-libcxx" with working_dir(libcxxdir, create=True): cmake_args = [ diff --git a/var/spack/repos/builtin/packages/llvm-doe/package.py b/var/spack/repos/builtin/packages/llvm-doe/package.py index d8ba211c29..29bdc912b7 100644 --- a/var/spack/repos/builtin/packages/llvm-doe/package.py +++ b/var/spack/repos/builtin/packages/llvm-doe/package.py @@ -429,7 +429,7 @@ class LlvmDoe(CMakePackage, CudaPackage): def cmake_args(self): spec = self.spec - define = CMakePackage.define + define = self.define from_variant = self.define_from_variant python = spec["python"] @@ -612,7 +612,7 @@ class LlvmDoe(CMakePackage, CudaPackage): @run_after("install") def post_install(self): spec = self.spec - define = CMakePackage.define + define = self.define # unnecessary if we build openmp via LLVM_ENABLE_RUNTIMES if "+cuda ~omp_as_runtime" in self.spec: diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index e8658f61ec..f1aeaaffd5 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -574,7 +574,7 @@ class Llvm(CMakePackage, CudaPackage): def cmake_args(self): spec = self.spec - define = CMakePackage.define + define = self.define from_variant = self.define_from_variant python = spec["python"] @@ -751,7 +751,7 @@ class Llvm(CMakePackage, CudaPackage): @run_after("install") def post_install(self): spec = self.spec - define = CMakePackage.define + define = self.define # unnecessary if we build openmp via LLVM_ENABLE_RUNTIMES if "+cuda ~omp_as_runtime" in self.spec: diff --git a/var/spack/repos/builtin/packages/mt-metis/package.py b/var/spack/repos/builtin/packages/mt-metis/package.py index 5e957dfba5..bdf9d1a6c4 100644 --- a/var/spack/repos/builtin/packages/mt-metis/package.py +++ b/var/spack/repos/builtin/packages/mt-metis/package.py @@ -23,11 +23,10 @@ class MtMetis(CMakePackage): variant("shared", default=True, description="Enable build of shared libraries") def cmake_args(self): - define = CMakePackage.define cmake_args = [ - define("DOMLIB_PATH", "domlib"), - define("WILDRIVER_PATH", "wildriver"), - define("METIS_PATH", "metis"), + self.define("DOMLIB_PATH", "domlib"), + self.define("WILDRIVER_PATH", "wildriver"), + self.define("METIS_PATH", "metis"), self.define_from_variant("SHARED", "shared"), ] return cmake_args diff --git a/var/spack/repos/builtin/packages/parmmg/package.py b/var/spack/repos/builtin/packages/parmmg/package.py index b541bac58f..66b5e5f45d 100644 --- a/var/spack/repos/builtin/packages/parmmg/package.py +++ b/var/spack/repos/builtin/packages/parmmg/package.py @@ -27,13 +27,12 @@ class Parmmg(CMakePackage): variant("pic", default=True, description="Build with position independent code") def cmake_args(self): - define = CMakePackage.define args = [ self.define_from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic"), - define("DOWNLOAD_MMG", False), - define("MMG_DIR", self.spec["mmg"].prefix), - define("DOWNLOAD_METIS", False), - define("METIS_DIR", self.spec["metis"].prefix), + self.define("DOWNLOAD_MMG", False), + self.define("MMG_DIR", self.spec["mmg"].prefix), + self.define("DOWNLOAD_METIS", False), + self.define("METIS_DIR", self.spec["metis"].prefix), ] return args diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py index 3253ad1799..d5c420468b 100644 --- a/var/spack/repos/builtin/packages/phist/package.py +++ b/var/spack/repos/builtin/packages/phist/package.py @@ -218,7 +218,7 @@ class Phist(CMakePackage): def cmake_args(self): spec = self.spec - define = CMakePackage.define + define = self.define if spec.satisfies("kernel_lib=builtin") and spec.satisfies("~mpi"): raise InstallError("~mpi not possible with kernel_lib=builtin!") diff --git a/var/spack/repos/builtin/packages/seacas/package.py b/var/spack/repos/builtin/packages/seacas/package.py index 45de2f1a5a..4d486f2fb2 100644 --- a/var/spack/repos/builtin/packages/seacas/package.py +++ b/var/spack/repos/builtin/packages/seacas/package.py @@ -161,7 +161,7 @@ class Seacas(CMakePackage): def cmake_args(self): spec = self.spec from_variant = self.define_from_variant - define = CMakePackage.define + define = self.define options = [] diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py index 8b816126e1..fe1bb0bef5 100644 --- a/var/spack/repos/builtin/packages/sundials/package.py +++ b/var/spack/repos/builtin/packages/sundials/package.py @@ -265,7 +265,7 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage): def cmake_args(self): spec = self.spec - define = CMakePackage.define + define = self.define from_variant = self.define_from_variant # List of CMake arguments diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index 67e993f6d5..4a44da5802 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -74,7 +74,7 @@ class SuperluDist(CMakePackage, CudaPackage, ROCmPackage): cmake_args = [] def append_define(*args): - cmake_args.append(CMakePackage.define(*args)) + cmake_args.append(self.define(*args)) def append_from_variant(*args): cmake_args.append(self.define_from_variant(*args)) diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 4784b43223..7b625f27f8 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -522,7 +522,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): options = [] spec = self.spec - define = CMakePackage.define + define = self.define define_from_variant = self.define_from_variant def _make_definer(prefix): diff --git a/var/spack/repos/builtin/packages/vite/package.py b/var/spack/repos/builtin/packages/vite/package.py index 59b709ef8a..881bb24948 100644 --- a/var/spack/repos/builtin/packages/vite/package.py +++ b/var/spack/repos/builtin/packages/vite/package.py @@ -29,13 +29,11 @@ class Vite(CMakePackage): variant("otf2", default=False, description="Support for OTF2 trace format") def cmake_args(self): - define = CMakePackage.define - from_variant = self.define_from_variant args = [ - define("USE_QT5", True), - define("USE_OPENGL", True), - define("USE_VBO", False), - from_variant("VITE_ENABLE_OTF2", "otf2"), - from_variant("VITE_ENABLE_TAU", "tau"), + self.define("USE_QT5", True), + self.define("USE_OPENGL", True), + self.define("USE_VBO", False), + self.define_from_variant("VITE_ENABLE_OTF2", "otf2"), + self.define_from_variant("VITE_ENABLE_TAU", "tau"), ] return args |