Skip to content

Commit 6eca741

Browse files
committed
build: distributedEngine is an array
1 parent 2a39a38 commit 6eca741

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

meson.build

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ project('TaskR', [ 'cpp', 'c'],
33
default_options : [
44
'cpp_std=c++20',
55
'buildtype=release'
6-
]
6+
],
7+
version: '1.0.0'
78
)
89

910
####### Storage for TaskR dependencies
@@ -40,12 +41,14 @@ if meson.is_subproject() == false
4041
endif
4142

4243
# Getting selected distributed engine
43-
distributedEngine = get_option('distributedEngine')
44+
distributedEngines = get_option('distributedEngines')
4445

4546
# If, selected, adding the dependency for the distributed engine
46-
if distributedEngine != 'none'
47-
HiCRBackends += distributedEngine
48-
endif
47+
foreach engine : distributedEngines
48+
if engine != 'none' and engine not in HiCRBackends
49+
HiCRBackends += engine
50+
endif
51+
endforeach
4952

5053
HiCRProject = subproject('HiCR', required: true, default_options: [ 'backends=' + ','.join(HiCRBackends), 'frontends=tasking' ])
5154
HiCRBuildDep = HiCRProject.get_variable('hicrBuildDep')

meson_options.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
option('distributedEngine', type : 'combo',
1+
option('distributedEngines', type : 'array',
22
choices : [ 'mpi', 'lpf', 'none' ],
3-
description : 'Specifies which engine (if any) to use for distributed computing examples',
4-
value: 'none'
3+
description : 'Specifies which engines (if any) to use for distributed computing examples',
4+
value: ['none']
55
)
66

77
option('executionStateType', type : 'array',

0 commit comments

Comments
 (0)