Skip to content

Commit 990360e

Browse files
committed
update meson
1 parent f8c2427 commit 990360e

File tree

4 files changed

+20
-11
lines changed

4 files changed

+20
-11
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ addons:
2525
script:
2626
- dub build --build=unittest -c blas
2727
- dub --root examples/gesv -c travis
28-
# - meson build && cd build && ninja -j4 && ninja test -v && cd ..
28+
# - meson build -D with_test=true && cd build && ninja -j4 && ninja test -v && cd ..

meson.build

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,6 @@ mir_lapack_dep = declare_dependency(
3939
dependencies: required_deps,
4040
)
4141

42-
mir_lapack_test_exe = executable(meson.project_name() + '-test',
43-
mir_lapack_src,
44-
include_directories: mir_lapack_dir,
45-
d_unittest: true,
46-
d_module_versions: ['mir_test'],
47-
link_args: '-main',
48-
dependencies: required_deps,
49-
)
50-
5142
install_subdir('source/',
5243
strip_directory : true,
5344
install_dir: 'include/d/' + meson.project_name(),
@@ -61,4 +52,17 @@ import('pkgconfig').generate(
6152
version: meson.project_version(),
6253
)
6354

64-
test(meson.project_name() + '-test', mir_lapack_test_exe)
55+
if get_option('with_test')
56+
57+
mir_lapack_test_exe = executable(meson.project_name() + '-test',
58+
mir_lapack_src,
59+
include_directories: mir_lapack_dir,
60+
d_unittest: true,
61+
d_module_versions: ['mir_test'],
62+
link_args: '-main',
63+
dependencies: required_deps,
64+
)
65+
66+
test(meson.project_name() + '-test', mir_lapack_test_exe)
67+
68+
endif

meson_options.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
option('with_test', type : 'boolean', value : false)

subprojects/mir-core.wrap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[wrap-git]
2+
directory=mir-core
3+
url=https://github.com/libmir/mir-core.git
4+
revision=head

0 commit comments

Comments
 (0)