summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Blake <blake14@llnl.gov>2020-02-21 12:42:37 -0800
committerGitHub <noreply@github.com>2020-02-21 14:42:37 -0600
commit6764a9464d2c49fb76cca7f90749b0dd53a8786e (patch)
treeaf78f3dcf2f2d273de8ffc127d357236f72b5658
parent6d8e0699f4d558c031ceb4c4e2f2414b8a530aac (diff)
downloadspack-6764a9464d2c49fb76cca7f90749b0dd53a8786e.tar.gz
spack-6764a9464d2c49fb76cca7f90749b0dd53a8786e.tar.bz2
spack-6764a9464d2c49fb76cca7f90749b0dd53a8786e.tar.xz
spack-6764a9464d2c49fb76cca7f90749b0dd53a8786e.zip
Changes necessary to build lbann@develop (#15153)
* Necessary changes to get lbann develop to compile. * Reformatting for flake8 * More flake8 changes. * Removing redundant clara dependency.
-rw-r--r--var/spack/repos/builtin/packages/lbann/package.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py
index cd8b81c3d5..04b044610f 100644
--- a/var/spack/repos/builtin/packages/lbann/package.py
+++ b/var/spack/repos/builtin/packages/lbann/package.py
@@ -183,8 +183,9 @@ class Lbann(CMakePackage):
args.extend(['-DAluminum_DIR={0}'.format(spec['aluminum'].prefix)])
if '+conduit' in spec:
- args.extend(['-DLBANN_CONDUIT_DIR={0}'.format(
- spec['conduit'].prefix)])
+ args.extend([
+ '-DLBANN_CONDUIT_DIR={0}'.format(spec['conduit'].prefix),
+ '-DConduit_DIR={0}'.format(spec['conduit'].prefix)])
# Add support for OpenMP
if (self.spec.satisfies('%clang')):