+ Don't include files submitted with PR#741.
This commit is contained in:
		| @@ -34,18 +34,15 @@ class NetlibLapack(Package): | |||||||
|  |  | ||||||
|     def patch(self): |     def patch(self): | ||||||
|         # Fix cblas CMakeLists.txt -- has wrong case for subdirectory name. |         # Fix cblas CMakeLists.txt -- has wrong case for subdirectory name. | ||||||
|         if self.spec.satisfies('@3.6.0:'): |  | ||||||
|         filter_file('${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/', |         filter_file('${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/', | ||||||
|                     '${CMAKE_CURRENT_SOURCE_DIR}/cmake/', 'CBLAS/CMakeLists.txt', string=True) |                     '${CMAKE_CURRENT_SOURCE_DIR}/cmake/', 'CBLAS/CMakeLists.txt', string=True) | ||||||
|  |  | ||||||
|  |  | ||||||
|     def install_one(self, spec, prefix, shared): |     def install_one(self, spec, prefix, shared): | ||||||
|         cmake_args = ['-DBUILD_SHARED_LIBS:BOOL=%s' % ('ON' if shared else 'OFF'), |         cmake_args = ['-DBUILD_SHARED_LIBS:BOOL=%s' % ('ON' if shared else 'OFF'), | ||||||
|  |                       '-DCBLAS=ON', # always build CBLAS | ||||||
|                       '-DCMAKE_BUILD_TYPE:STRING=%s' % ('Debug' if '+debug' in spec else 'Release'), |                       '-DCMAKE_BUILD_TYPE:STRING=%s' % ('Debug' if '+debug' in spec else 'Release'), | ||||||
|                       '-DLAPACKE:BOOL=%s' % ('ON' if '+lapacke' in spec else 'OFF')] |                       '-DLAPACKE:BOOL=%s' % ('ON' if '+lapacke' in spec else 'OFF')] | ||||||
|         if spec.satisfies('@3.6.0:'): |  | ||||||
|             cmake_args.extend(['-DCBLAS=ON']) # always build CBLAS |  | ||||||
|  |  | ||||||
|         if '+external-blas' in spec: |         if '+external-blas' in spec: | ||||||
|             # TODO : the mechanism to specify the library should be more general, |             # TODO : the mechanism to specify the library should be more general, | ||||||
|             # TODO : but this allows to have an hook to an external blas |             # TODO : but this allows to have an hook to an external blas | ||||||
| @@ -83,3 +80,6 @@ def setup_dependent_package(self, module, dspec): | |||||||
|         if '+shared' in self.spec: |         if '+shared' in self.spec: | ||||||
|             self.spec.blas_shared_lib   = join_path(libdir, 'libblas.%s' % dso_suffix) |             self.spec.blas_shared_lib   = join_path(libdir, 'libblas.%s' % dso_suffix) | ||||||
|             self.spec.lapack_shared_lib = join_path(libdir, 'liblapack.%s' % dso_suffix) |             self.spec.lapack_shared_lib = join_path(libdir, 'liblapack.%s' % dso_suffix) | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Kelly (KT) Thompson
					Kelly (KT) Thompson