From 6764a9464d2c49fb76cca7f90749b0dd53a8786e Mon Sep 17 00:00:00 2001
From: Robert Blake <blake14@llnl.gov>
Date: Fri, 21 Feb 2020 12:42:37 -0800
Subject: [PATCH] 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.
---
var/spack/repos/builtin/packages/lbann/package.py | 5 +++--
1 file 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 @@ def cmake_args(self):
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')):
--
GitLab