File tree Expand file tree Collapse file tree 2 files changed +11
-2
lines changed Expand file tree Collapse file tree 2 files changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -112,6 +112,9 @@ jobs:
112
112
type :
113
113
- " debug"
114
114
- " release"
115
+ permissive :
116
+ - false
117
+ - true
115
118
116
119
runs-on : windows-2022
117
120
@@ -130,7 +133,7 @@ jobs:
130
133
- uses : ilammy/msvc-dev-cmd@v1
131
134
132
135
- name : Configure Meson
133
- run : meson setup build --vsenv --buildtype=${{ matrix.type }} -Ddevel=true -Db_lto=false
136
+ run : meson setup build --vsenv --buildtype=${{ matrix.type }} -Ddevel=true -Db_lto=false -Dpermissive=${{ matrix.permissive }}
134
137
135
138
- name : Build
136
139
run : meson compile -C build
Original file line number Diff line number Diff line change @@ -19,6 +19,7 @@ project(
19
19
' b_ndebug=if-release' ,
20
20
# compiler options
21
21
' cpp_std=c++17'
22
+ ' permissive=false'
22
23
]
23
24
)
24
25
@@ -36,6 +37,7 @@ is_devel = get_option('devel')
36
37
is_debug = get_option (' debug' )
37
38
is_release = not is_debug
38
39
is_pedantic = get_option (' pedantic' ) or is_devel
40
+ is_permissive = get_option (' permissive' )
39
41
is_windows = host_machine .system() == ' windows'
40
42
is_x64 = host_machine .cpu_family() == ' x86_64'
41
43
is_subproject = meson .is_subproject()
@@ -75,7 +77,6 @@ global_args = cpp.get_supported_arguments(
75
77
' /Gy' , # function-level linking
76
78
' /GF' , # string pooling
77
79
' /openmp-' ,
78
- ' /permissive-' ,
79
80
' /utf-8' ,
80
81
' /volatile:iso' ,
81
82
' /Zc:__cplusplus' ,
@@ -88,6 +89,11 @@ if has_exceptions
88
89
else
89
90
global_args += cpp.get_supported_arguments(' -D_HAS_EXCEPTIONS=0' )
90
91
endif
92
+ if is_permissive
93
+ global_args += cpp.get_supported_arguments(' /permissive' ) # TODO '-DTOML_DISABLE_CONDITIONAL_NOEXCEPT_LAMBDA=1')
94
+ else
95
+ global_args += cpp.get_supported_arguments(' /permissive-' )
96
+ endif
91
97
if is_pedantic
92
98
global_args += cpp.get_supported_arguments(
93
99
# clang
You can’t perform that action at this time.
0 commit comments