From 9853fd50e2dc6253a2c80b38fc3bad8f226ce94e Mon Sep 17 00:00:00 2001 From: "Seth R. Johnson" Date: Thu, 7 Oct 2021 11:49:51 -0400 Subject: itk: use CMakePackage helpers (#26572) --- var/spack/repos/builtin/packages/itk/package.py | 31 +++++++++++-------------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/var/spack/repos/builtin/packages/itk/package.py b/var/spack/repos/builtin/packages/itk/package.py index 5b0d189f65..e96b9e81be 100644 --- a/var/spack/repos/builtin/packages/itk/package.py +++ b/var/spack/repos/builtin/packages/itk/package.py @@ -60,28 +60,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 = [ - '-DBUILD_SHARED_LIBS=ON', - '-DITK_USE_SYSTEM_LIBRARIES=ON', + 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'), ] - if '+review' in self.spec: - args.append('-DModule_ITKReview=ON') - else: - args.append('-DModule_ITKReview=OFF') - if '+rtk' in self.spec: - args.append('-DModule_RTK=ON') - else: - args.append('-DModule_RTK=OFF') - - if '^mkl' in self.spec: - args.append('-DITK_USE_MKL=ON') - else: + if not use_mkl: args.extend([ - '-DITK_USE_MKL=OFF', - '-DUSE_FFTWD=ON', - '-DUSE_FFTWF=ON', - '-DUSE_SYSTEM_FFTW=ON', + force('USE_FFTWD', True), + force('USE_FFTWF', True), + force('USE_SYSTEM_FFTW', True), ]) return args -- cgit v1.2.3-70-g09d2