zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deal.II: Fix broken include and library path concatenation (#19315)

Browse Source
This commit is contained in:
Jean-Paul Pelteret 2020-10-15 04:23:55 +02:00 committed by GitHub
parent 71d2ce7403
commit 50c7bc8cfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
var/spack/repos/builtin/packages/dealii/package.py
View File

@ -303,9 +303,10 @@ def cmake_args(self):
# Note that both lapack and blas are provided in -DLAPACK_XYZ. # Note that both lapack and blas are provided in -DLAPACK_XYZ.
self.define('LAPACK_FOUND', True), self.define('LAPACK_FOUND', True),
self.define( self.define(
'LAPACK_INCLUDE_DIRS', lapack_blas_headers.directories 'LAPACK_INCLUDE_DIRS',
';'.join(lapack_blas_headers.directories)
), ),
self.define('LAPACK_LIBRARIES', lapack_blas_libs), self.define('LAPACK_LIBRARIES', lapack_blas_libs.joined(';')),
self.define('UMFPACK_DIR', spec['suite-sparse'].prefix), self.define('UMFPACK_DIR', spec['suite-sparse'].prefix),
self.define('ZLIB_DIR', spec['zlib'].prefix), self.define('ZLIB_DIR', spec['zlib'].prefix),
self.define('DEAL_II_ALLOW_BUNDLED', False) self.define('DEAL_II_ALLOW_BUNDLED', False)
@ -318,7 +319,7 @@ def cmake_args(self):
self.define( self.define(
'BZIP2_INCLUDE_DIRS', spec['bzip2'].prefix.include 'BZIP2_INCLUDE_DIRS', spec['bzip2'].prefix.include
), ),
self.define('BZIP2_LIBRARIES', spec['bzip2'].libs) self.define('BZIP2_LIBRARIES', spec['bzip2'].libs.joined(';'))
]) ])
# Doxygen documentation # Doxygen documentation
@ -428,9 +429,10 @@ def cmake_args(self):
self.define('TBB_FOUND', True), self.define('TBB_FOUND', True),
self.define('TBB_VERSION', tbb_ver), self.define('TBB_VERSION', tbb_ver),
self.define( self.define(
'TBB_INCLUDE_DIRS', spec['tbb'].headers.directories 'TBB_INCLUDE_DIRS',
';'.join(spec['tbb'].headers.directories)
), ),
self.define('TBB_LIBRARIES', spec['tbb'].libs) self.define('TBB_LIBRARIES', spec['tbb'].libs.joined(';'))
]) ])
else: else:
options.append( options.append(
@ -481,7 +483,7 @@ def cmake_args(self):
spec['netcdf-cxx'].prefix.include, spec['netcdf-cxx'].prefix.include,
spec['netcdf-c'].prefix.include spec['netcdf-c'].prefix.include
)), )),
self.define('NETCDF_LIBRARIES', netcdf_libs) self.define('NETCDF_LIBRARIES', netcdf_libs.joined(';'))
]) ])
else: else:
options.append( options.append(
@ -499,7 +501,7 @@ def cmake_args(self):
self.define( self.define(
'SCALAPACK_INCLUDE_DIRS', spec['scalapack'].prefix.include 'SCALAPACK_INCLUDE_DIRS', spec['scalapack'].prefix.include
), ),
self.define('SCALAPACK_LIBRARIES', scalapack_libs) self.define('SCALAPACK_LIBRARIES', scalapack_libs.joined(';'))
]) ])
# Open Cascade # Open Cascade