fix blas/lapack usage after PR 1875 (#3365)

This commit is contained in:
Denis Davydov 2017-03-04 16:42:02 +01:00 committed by Adam J. Stewart
parent c3ac86310e
commit a36ed7fb9b
3 changed files with 20 additions and 20 deletions

View file

@ -127,11 +127,11 @@ def cmake_args(self):
'_64_' if '+int64_blas' in spec else '_')),
'-DCUSTOM_LAPACK_SUFFIX:BOOL=TRUE']),
else:
math_libs = (spec['lapack'].lapack_libs +
spec['blas'].blas_libs)
math_libs = (spec['lapack'].libs +
spec['blas'].libs)
if '+scalapack' in spec:
math_libs = spec['scalapack'].scalapack_libs + math_libs
math_libs = spec['scalapack'].libs + math_libs
args.extend([
'-DMATH_LIBS:STRING={0}'.format(math_libs.search_flags),

View file

@ -160,8 +160,8 @@ def build_user_atc(self):
make('lib', '-f', 'Makefile.icc')
with open('Makefile.lammps', 'w') as fh:
lapack_blas = (self.spec['lapack'].lapack_libs +
self.spec['blas'].blas_libs)
lapack_blas = (self.spec['lapack'].libs +
self.spec['blas'].libs)
makefile = [
'user-atc_SYSINC =',
'user-atc_SYSLIB = {0}'.format(lapack_blas.ld_flags),

View file

@ -51,8 +51,8 @@ def cmake_args(self):
options.extend([
'-DCMAKE_INSTALL_PREFIX=%s' % prefix,
'-DCMAKE_INSTALL_NAME_DIR:PATH=%s/lib' % prefix,
'-DLAPACK_LIBRARIES=%s;%s' % (spec['blas'].blas_libs,
spec['lapack'].lapack_libs)
'-DLAPACK_LIBRARIES=%s;%s' % (spec['blas'].libs,
spec['lapack'].libs)
])
if '+fortran' in spec: