diff options
| author | Jean-Paul Pelteret <jppelteret@gmail.com> | 2020-10-15 04:23:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-14 21:23:55 -0500 |
| commit | 50c7bc8cfdd042b18142ac73885686927390982d (patch) | |
| tree | 2bf3d3e79b3ac737a19c3f7c9d2c5d3b997c2ccb | |
| parent | 71d2ce7403609053471b5b6d43a5ec45aeb5d329 (diff) | |
| download | spack-50c7bc8cfdd042b18142ac73885686927390982d.tar.gz spack-50c7bc8cfdd042b18142ac73885686927390982d.tar.bz2 spack-50c7bc8cfdd042b18142ac73885686927390982d.tar.xz spack-50c7bc8cfdd042b18142ac73885686927390982d.zip | |
deal.II: Fix broken include and library path concatenation (#19315)
| -rw-r--r-- | var/spack/repos/builtin/packages/dealii/package.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 4a841b5aae..dd12de9f2c 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -303,9 +303,10 @@ class Dealii(CMakePackage, CudaPackage): # Note that both lapack and blas are provided in -DLAPACK_XYZ. self.define('LAPACK_FOUND', True), 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('ZLIB_DIR', spec['zlib'].prefix), self.define('DEAL_II_ALLOW_BUNDLED', False) @@ -318,7 +319,7 @@ class Dealii(CMakePackage, CudaPackage): self.define( 'BZIP2_INCLUDE_DIRS', spec['bzip2'].prefix.include ), - self.define('BZIP2_LIBRARIES', spec['bzip2'].libs) + self.define('BZIP2_LIBRARIES', spec['bzip2'].libs.joined(';')) ]) # Doxygen documentation @@ -428,9 +429,10 @@ class Dealii(CMakePackage, CudaPackage): self.define('TBB_FOUND', True), self.define('TBB_VERSION', tbb_ver), 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: options.append( @@ -481,7 +483,7 @@ class Dealii(CMakePackage, CudaPackage): spec['netcdf-cxx'].prefix.include, spec['netcdf-c'].prefix.include )), - self.define('NETCDF_LIBRARIES', netcdf_libs) + self.define('NETCDF_LIBRARIES', netcdf_libs.joined(';')) ]) else: options.append( @@ -499,7 +501,7 @@ class Dealii(CMakePackage, CudaPackage): self.define( 'SCALAPACK_INCLUDE_DIRS', spec['scalapack'].prefix.include ), - self.define('SCALAPACK_LIBRARIES', scalapack_libs) + self.define('SCALAPACK_LIBRARIES', scalapack_libs.joined(';')) ]) # Open Cascade |