diff options
| author | Jeffrey Salmond <js947@users.noreply.github.com> | 2016-11-04 17:57:53 +0000 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-11-04 10:57:53 -0700 |
| commit | a135a1245a3bcf61a683d25c313984408184fca5 (patch) | |
| tree | 912794906a716afd4debd0224119b80a8b87d270 | |
| parent | 29f81b777516a49f15b2f6a7de58ef0d03ebdeec (diff) | |
| download | spack-a135a1245a3bcf61a683d25c313984408184fca5.tar.gz spack-a135a1245a3bcf61a683d25c313984408184fca5.tar.bz2 spack-a135a1245a3bcf61a683d25c313984408184fca5.tar.xz spack-a135a1245a3bcf61a683d25c313984408184fca5.zip | |
tweaks to packages using CMakePackage (#2241)
* fix to trilinos package
* fix to dealii package
* fix to everytrace package
* fix to everytrace-example package
* changes suggested by @davydden
4 files changed, 5 insertions, 12 deletions
diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 6a719b29b0..563f751e0b 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -117,19 +117,16 @@ class Dealii(CMakePackage): depends_on("numdiff", when='@develop') depends_on("astyle@2.04", when='@develop') + def build_type(self): + # CMAKE_BUILD_TYPE should be DebugRelease | Debug | Release + return 'DebugRelease' + def cmake_args(self): spec = self.spec options = [] - options.extend(std_cmake_args) - - # CMAKE_BUILD_TYPE should be DebugRelease | Debug | Release - for word in options[:]: - if word.startswith('-DCMAKE_BUILD_TYPE'): - options.remove(word) lapack_blas = spec['lapack'].lapack_libs + spec['blas'].blas_libs options.extend([ - '-DCMAKE_BUILD_TYPE=DebugRelease', '-DDEAL_II_COMPONENT_EXAMPLES=ON', '-DDEAL_II_WITH_THREADS:BOOL=ON', '-DBOOST_DIR=%s' % spec['boost'].prefix, diff --git a/var/spack/repos/builtin/packages/everytrace-example/package.py b/var/spack/repos/builtin/packages/everytrace-example/package.py index 8a85423192..8c49e04634 100644 --- a/var/spack/repos/builtin/packages/everytrace-example/package.py +++ b/var/spack/repos/builtin/packages/everytrace-example/package.py @@ -39,8 +39,5 @@ class EverytraceExample(CMakePackage): # Currently the only MPI this everytrace works with. depends_on('openmpi') - def configure_args(self): - return [] - def setup_environment(self, spack_env, env): env.prepend_path('PATH', join_path(self.prefix, 'bin')) diff --git a/var/spack/repos/builtin/packages/everytrace/package.py b/var/spack/repos/builtin/packages/everytrace/package.py index ee1a058009..a3f3e2cfce 100644 --- a/var/spack/repos/builtin/packages/everytrace/package.py +++ b/var/spack/repos/builtin/packages/everytrace/package.py @@ -42,7 +42,7 @@ class Everytrace(CMakePackage): depends_on('cmake', type='build') depends_on('mpi', when='+mpi') - def configure_args(self): + def cmake_args(self): spec = self.spec return [ '-DUSE_MPI=%s' % ('YES' if '+mpi' in spec else 'NO'), diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 046a0e0fc6..07393f9e9b 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -130,7 +130,6 @@ class Trilinos(CMakePackage): cxx_flags = [] options = [] - options.extend(std_cmake_args) mpi_bin = spec['mpi'].prefix.bin # Note: -DXYZ_LIBRARY_NAMES= needs semicolon separated list of names |