Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve build system warnings #8

Merged
merged 1 commit into from
Nov 13, 2024
Merged

Resolve build system warnings #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions 3rdparty/packagefiles/armadillo-code/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,28 @@
project('armadillo', 'cpp',
version: '14.1.x',
version: '14.0.x',
)

# Header-only library
armadillo_inc = include_directories('include')

if get_option('lapack') == 'openblas64'
lapack_dep = dependency('openblas64')
elif get_option('lapack') == 'openblas'
lapack_dep = dependency('openblas')
elif get_option('lapack') == 'lapack64'
lapack_dep = dependency('lapack64')
else # lapack or altas
lapack_dep = dependency('lapack')
endif


armadillo_dep = declare_dependency(
include_directories: armadillo_inc,
compile_args: [
'-DARMA_DONT_USE_BLAS',
'-DARMA_DONT_USE_ARPACK',
],
dependencies: [
dependency('openblas', required: false),
dependency('lapack', required: false),
dependency('arpack2', required: false),
]
)
lapack_dep,
],
)
11 changes: 11 additions & 0 deletions 3rdparty/packagefiles/armadillo-code/meson.options
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
option('lapack',
description: 'Choose an implementation of the LAPACK solver',
type: 'combo',
choices: [
'openblas64',
'openblas',
'lapack64',
'lapack',
],
value: 'openblas',
)
2 changes: 1 addition & 1 deletion examples/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
add_languages('c')
add_languages('c', native: false)

hdf5_dep = dependency('hdf5', language: 'c', required: false)

Expand Down
1 change: 1 addition & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
project('MicroscPSF', 'cpp',
meson_version: '>=1.1',
license: 'MIT',
license_files: [
'LICENSE.txt',
Expand Down
Loading