summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/flecsi/package.py22
-rw-r--r--var/spack/repos/builtin/packages/legion/package.py2
2 files changed, 17 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py
index 8dea473d03..947719508c 100644
--- a/var/spack/repos/builtin/packages/flecsi/package.py
+++ b/var/spack/repos/builtin/packages/flecsi/package.py
@@ -39,19 +39,21 @@ class Flecsi(CMakePackage):
homepage = "http://flecsi.lanl.gov/"
url = "https://github.com/laristra/flecsi/tarball/v1.0"
- version('develop', git='https://github.com/laristra/flecsi', branch='master', submodules=True)
+ version('develop', git='https://github.com/laristra/flecsi', branch='master', submodules=False)
variant('debug', default=False, description='Build debug version')
+ variant('mpi', default=True,
+ description='Build on top of mpi conduit for mpi inoperability')
depends_on("cmake@3.1:", type='build')
- depends_on("legion")
+ depends_on("legion+shared", when='~mpi')
+ depends_on("legion+shared+mpi", when='+mpi')
- # drop when #3779 has been fixed
+ # drop when #3958 has been merged
def do_fetch(self, mirror_only=True):
super(Flecsi, self).do_fetch(mirror_only)
git = which("git")
- git('-C', 'flecsi', 'submodule', 'update', '--init', '--recursive',
- '--depth=1')
+ git('-C', 'flecsi', 'submodule', 'update', '--init', '--recursive')
def build_type(self):
spec = self.spec
@@ -61,4 +63,12 @@ class Flecsi(CMakePackage):
return 'Release'
def cmake_args(self):
- return ['-DENABLE_UNIT_TESTS=ON']
+ options = ['-DENABLE_UNIT_TESTS=ON']
+
+ if '+mpi' in self.spec:
+ options.extend([
+ '-DENABLE_MPI=ON',
+ '-DFLECSI_RUNTIME_MODEL=mpilegion'
+ ])
+
+ return options
diff --git a/var/spack/repos/builtin/packages/legion/package.py b/var/spack/repos/builtin/packages/legion/package.py
index 2d93ee0e3a..783bd417a0 100644
--- a/var/spack/repos/builtin/packages/legion/package.py
+++ b/var/spack/repos/builtin/packages/legion/package.py
@@ -66,7 +66,7 @@ class Legion(CMakePackage):
options = [
'-DLegion_USE_GASNet=ON',
'-DLegion_BUILD_EXAMPLES=ON',
- '-DBUILD_SHARED_LIBS=%s' % ('+shared' in spec)]
+ '-DBUILD_SHARED_LIBS=%s' % ('+shared' in self.spec)]
if '+mpi' in self.spec:
options.append('-DGASNet_CONDUIT=mpi')