portage: fixes + added v1.1.* (#5706)
This commit is contained in:
parent
d0cf3db46e
commit
89344ebd44
@ -34,12 +34,16 @@ class Portage(CMakePackage):
|
|||||||
homepage = "http://portage.lanl.gov/"
|
homepage = "http://portage.lanl.gov/"
|
||||||
url = "https://github.com/laristra/portage/tarball/v1.0"
|
url = "https://github.com/laristra/portage/tarball/v1.0"
|
||||||
|
|
||||||
|
# tarballs don't have submodules, so use git tags
|
||||||
|
version('1.1.1', git='https://github.com/laristra/portage', tag='v1.1.1', submodules=True)
|
||||||
|
version('1.1.0', git='https://github.com/laristra/portage', tag='v1.1.0', submodules=True)
|
||||||
version('develop', git='https://github.com/laristra/portage', branch='master', submodules=True)
|
version('develop', git='https://github.com/laristra/portage', branch='master', submodules=True)
|
||||||
|
|
||||||
variant('mpi', default=True, description='Support MPI')
|
variant('mpi', default=True, description='Support MPI')
|
||||||
|
|
||||||
depends_on("cmake@3.1:", type='build')
|
depends_on("cmake@3.1:", type='build')
|
||||||
depends_on('mpi', when='+mpi')
|
depends_on('mpi', when='+mpi')
|
||||||
|
depends_on('lapack')
|
||||||
|
|
||||||
def cmake_args(self):
|
def cmake_args(self):
|
||||||
options = ['-DENABLE_UNIT_TESTS=ON', '-DENABLE_APP_TESTS=ON']
|
options = ['-DENABLE_UNIT_TESTS=ON', '-DENABLE_APP_TESTS=ON']
|
||||||
@ -47,7 +51,9 @@ def cmake_args(self):
|
|||||||
if '+mpi' in self.spec:
|
if '+mpi' in self.spec:
|
||||||
options.extend([
|
options.extend([
|
||||||
'-DENABLE_MPI=ON',
|
'-DENABLE_MPI=ON',
|
||||||
'-DENABLE_MPI_CXX_BINDINGS=ON'
|
'-DENABLE_MPI_CXX_BINDINGS=ON',
|
||||||
|
'-DCMAKE_CXX_COMPILER=%s' % self.spec['mpi'].mpicxx,
|
||||||
|
'-DCMAKE_C_COMPILER=%s' % self.spec['mpi'].mpicc,
|
||||||
])
|
])
|
||||||
else:
|
else:
|
||||||
options.append('-DENABLE_MPI=OFF')
|
options.append('-DENABLE_MPI=OFF')
|
||||||
|
Loading…
Reference in New Issue
Block a user