diff --git a/lapack-netlib/BLAS/SRC/meson.build b/lapack-netlib/BLAS/SRC/meson.build index 82c7e19d6..78fdd0055 100644 --- a/lapack-netlib/BLAS/SRC/meson.build +++ b/lapack-netlib/BLAS/SRC/meson.build @@ -30,13 +30,6 @@ # _sblas3 -- Single precision real BLAS3 routines # _cblas3 -- Single precision complex BLAS3 routines -prec = get_option('realkind') -build_single = get_option('build_single') -build_double = get_option('build_double') -build_complex = get_option('build_complex') -build_complex16 = get_option('build_complex16') -build_all_prec = get_option('build_all_prec') - # _allblas -- Auxiliary routines for Level 2 and 3 BLAS _allblas = library('_allblas', sources: [ 'lsame.f', 'xerbla.f', 'xerbla_array.f' ]) @@ -282,7 +275,7 @@ if prec == 's' or build_single or build_all_prec endif # Create the blas library -blas = library('blas', +blas = library(_netlib_blas_name, sources: _blas_netlib_srcs, link_with: _allblas, version: lapack_version, diff --git a/lapack-netlib/BLAS/meson.build b/lapack-netlib/BLAS/meson.build new file mode 100644 index 000000000..f1493b33f --- /dev/null +++ b/lapack-netlib/BLAS/meson.build @@ -0,0 +1,7 @@ +_netlib_blas_name = get_option('netlib_blas_name') +_netlib_cblas_name = get_option('netlib_cblas_name') +_netlib_lapack_name = get_option('netlib_lapack_name') +_netlib_tmglib_name = get_option('netlib_tmglib_name') +_netlib_lapacke_name = get_option('netlib_lapacke_name') + +subdir('SRC') diff --git a/lapack-netlib/INSTALL/meson.build b/lapack-netlib/INSTALL/meson.build index 25824afa7..f474e5761 100644 --- a/lapack-netlib/INSTALL/meson.build +++ b/lapack-netlib/INSTALL/meson.build @@ -3,13 +3,6 @@ # _install_aux -- Auxiliary function library # _int_cpu_time -- Timing library, Fortran only # - -prec = get_option('realkind') -build_single = get_option('build_single') -build_double = get_option('build_double') -build_all_prec = get_option('build_all_prec') -use_c_lapack = get_option('use_c_lapack') - # C / Fortran _install_aux_srcs = [] _ia_linkwith = [] diff --git a/lapack-netlib/meson.build b/lapack-netlib/meson.build index f1a467664..aa9871729 100644 --- a/lapack-netlib/meson.build +++ b/lapack-netlib/meson.build @@ -9,6 +9,16 @@ lapack_minor_version = 12 lapack_patch_version = 0 lapack_version = f'@lapack_major_version@.@lapack_minor_version@.@lapack_patch_version@' -subdir('BLAS/SRC') # Defines blas and _allblas +# Common variables +prec = get_option('realkind') +build_single = get_option('build_single') +build_double = get_option('build_double') +build_complex = get_option('build_complex') +build_complex16 = get_option('build_complex16') +build_all_prec = get_option('build_all_prec') +use_c_lapack = get_option('use_c_lapack') + +# Sub-directories +subdir('BLAS') # Defines blas and _allblas subdir('INSTALL') # Defines _install_aux and _int_cpu_time subdir('SRC') # Defines lapack diff --git a/meson_options.txt b/meson_options.txt index 9c0071742..d659d33f7 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -33,3 +33,10 @@ option('realkind', type : 'string', value : 'd', # Meson only # This is the equivalent of producing all precisions via make all inside lapack-netlib/blas/src option('build_all_prec', type: 'boolean', value: true, description: 'Build all precisions') + +# For naming netlib libraries +option('netlib_blas_name', type: 'string', value: 'refblas', description: 'Name for the Netlib BLAS library') +option('netlib_cblas_name', type: 'string', value: 'clbas', description: 'Name for the Netlib CBLAS library') +option('netlib_lapack_name', type: 'string', value: 'lapack', description: 'Name for the Netlib LAPACK library') +option('netlib_tmglib_name', type: 'string', value: 'tmglib', description: 'Name for the Netlib TMGLIB library') +option('netlib_lapacke_name', type: 'string', value: 'lapacke', description: 'Name for the Netlib LAPACKE library')