Skip to content

Commit

Permalink
add blas subproject for easier build anywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
scivision committed Aug 6, 2019
1 parent 61ab6fc commit 6946ac9
Showing 1 changed file with 22 additions and 18 deletions.
40 changes: 22 additions & 18 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,32 @@ blas = dependency('blas', required: false)
if not blas.found()
blas = fc.find_library('blas', required: false)
endif
if not blas.found()
blas_proj = subproject('blas')
blas = declare_dependency(link_with: blas_proj.get_variable('blas'))
endif

if blas.found()
linpack = library('linpack', 'SOFTWARE/dsvdc.f',
dependencies: blas)

fleet_exe = executable('fleet', 'FLEET/fleet.c',
dependencies: libm,
link_with: linpack)
test('Fleet', fleet_exe,
args: ['new2rastertreet.', '2.', '9', '0.05', meson.source_root() / 'TESTDATA/TREE_DATA/TRANS', meson.source_root() / 'out', meson.source_root() / 'out'],
timeout: 30,
is_parallel: false)
linpack = library('linpack', 'SOFTWARE/dsvdc.f',
dependencies: blas)

singh_exe = executable('singh', 'SINGH/singh.c',
link_with: linpack,
dependencies: libm,
include_directories: 'SOFTWARE')
fleet_exe = executable('fleet', 'FLEET/fleet.c',
dependencies: libm,
link_with: linpack)
test('Fleet', fleet_exe,
args: ['new2rastertreet.', '2.', '9', '0.05', meson.source_root() / 'TESTDATA/TREE_DATA/TRANS', meson.source_root() / 'out', meson.source_root() / 'out'],
timeout: 30,
is_parallel: false)

singh_exe = executable('singh', 'SINGH/singh.c',
link_with: linpack,
dependencies: libm,
include_directories: 'SOFTWARE')

test('Singh', singh_exe,
args: ['new2binarytreet.', '20', meson.source_root() / 'TESTDATA/TREE_DATA/TRANS', meson.source_root() /'out', '-B', '150', '150', '-i', '25', '-n', '2', '-w', '2', '-N', '4'],
timeout: 60)

test('Singh', singh_exe,
args: ['new2binarytreet.', '20', meson.source_root() / 'TESTDATA/TREE_DATA/TRANS', meson.source_root() /'out', '-B', '150', '150', '-i', '25', '-n', '2', '-w', '2', '-N', '4'],
timeout: 60)
endif

flow2ps_exe = executable('flow2ps', 'SOFTWARE/psflow.c',
dependencies: libm)
Expand Down

0 comments on commit 6946ac9

Please sign in to comment.