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

tweaks to packages using CMakePackage (#2241)

Browse Source 
* fix to trilinos package

* fix to dealii package

* fix to everytrace package

* fix to everytrace-example package

* changes suggested by @davydden
This commit is contained in:
Jeffrey Salmond 2016-11-04 17:57:53 +00:00 committed by Todd Gamblin
parent 29f81b7775
commit a135a1245a
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/repos/builtin/packages/dealii/package.py
View File

@ -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,

3
var/spack/repos/builtin/packages/everytrace-example/package.py
View File

@ -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'))

2
var/spack/repos/builtin/packages/everytrace/package.py
View File

@ -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'),

1
var/spack/repos/builtin/packages/trilinos/package.py
View File

@ -130,7 +130,6 @@ def cmake_args(self):
cxx_flags = []
options = []
options.extend(std_cmake_args)
mpi_bin = spec['mpi'].prefix.bin
# Note: -DXYZ_LIBRARY_NAMES= needs semicolon separated list of names