Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions .github/workflows/validate-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
#os: [ubuntu-20.04, ubuntu-latest, windows-latest, macos-latest]
os: [ubuntu-20.04, ubuntu-latest, windows-latest]
os: [ubuntu-22.04, ubuntu-latest, windows-latest]

steps:
- name: Fetch sources
Expand Down
5 changes: 5 additions & 0 deletions meson.options
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,8 @@ option('use_eigen',
type: 'boolean',
value: false,
)
option('use_openmp',
description: 'Perform cylindrical frame to Cartesian frame interpolation with multithread',
type: 'boolean',
value: false,
)
9 changes: 8 additions & 1 deletion microsc-psf/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ else
use_lapack_args = []
endif

openmp_dep = get_option('use_openmp') ? [
dependency('openmp', language: 'cpp'),
dependency('threads'),
] : []

microsc_psf_lib = static_library('microsc-psf',
sources: [
'src/main.cpp',
Expand All @@ -48,6 +53,7 @@ microsc_psf_lib = static_library('microsc-psf',
armadillo_dep,
boost_math_dep,
eigen_solver_dep,
openmp_dep,
],
)

Expand All @@ -60,5 +66,6 @@ microsc_psf_dep = declare_dependency(
],
dependencies: [
armadillo_dep,
openmp_dep,
],
)
)
Loading