Skip to content

Commit 9fa8d58

Browse files
committed
BOOST_TEST_EQ
1 parent fb40ddd commit 9fa8d58

31 files changed

+863
-809
lines changed

.vscode/tasks.json

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{
77
"label": "Setup Meson build directories",
88
"type": "shell",
9-
"command": "cd ${workspaceRoot} && meson setup bld/debug && meson setup -D qvm_header_mode='single' -D cpp_std=c++11 bld/debug_qvm_hpp && meson setup -D qvm_header_mode='single_lite' bld/debug_qvm_lite_hpp && meson setup bld/release --buildtype release && meson setup -D qvm_header_mode='single' -D cpp_std=c++11 bld/release_qvm_hpp --buildtype release && meson setup -D qvm_header_mode='single_lite' bld/release_qvm_lite_hpp --buildtype release",
9+
"command": "cd ${workspaceRoot} && meson setup bld/debug && meson setup -D qvm_header_mode=single -D cpp_std=c++11 bld/debug_qvm_hpp && meson setup -D qvm_header_mode=single_lite bld/debug_qvm_lite_hpp && meson setup bld/release --buildtype release && meson setup -D qvm_header_mode=single -D cpp_std=c++11 bld/release_qvm_hpp --buildtype release && meson setup -D qvm_header_mode=single_lite bld/release_qvm_lite_hpp --buildtype release",
1010
"problemMatcher": []
1111
},
1212
{
@@ -35,6 +35,15 @@
3535
"relative",
3636
"${workspaceRoot}/bld/debug"
3737
]
38+
},
39+
"windows": {
40+
"problemMatcher": {
41+
"base": "$msCompile",
42+
"fileLocation": [
43+
"relative",
44+
"${workspaceRoot}/bld/debug"
45+
]
46+
}
3847
}
3948
},
4049
{
@@ -51,6 +60,15 @@
5160
"relative",
5261
"${workspaceRoot}/bld/debug"
5362
]
63+
},
64+
"windows": {
65+
"problemMatcher": {
66+
"base": "$msCompile",
67+
"fileLocation": [
68+
"relative",
69+
"${workspaceRoot}/bld/debug"
70+
]
71+
}
5472
}
5573
},
5674
{
@@ -67,6 +85,15 @@
6785
"relative",
6886
"${workspaceRoot}/bld/release"
6987
]
88+
},
89+
"windows": {
90+
"problemMatcher": {
91+
"base": "$msCompile",
92+
"fileLocation": [
93+
"relative",
94+
"${workspaceRoot}/bld/release"
95+
]
96+
}
7097
}
7198
},
7299
{
@@ -83,6 +110,15 @@
83110
"relative",
84111
"${workspaceRoot}/bld/release"
85112
]
113+
},
114+
"windows": {
115+
"problemMatcher": {
116+
"base": "$msCompile",
117+
"fileLocation": [
118+
"relative",
119+
"${workspaceRoot}/bld/release"
120+
]
121+
}
86122
}
87123
},
88124
{
@@ -99,6 +135,15 @@
99135
"relative",
100136
"${workspaceRoot}/bld/debug"
101137
]
138+
},
139+
"windows": {
140+
"problemMatcher": {
141+
"base": "$msCompile",
142+
"fileLocation": [
143+
"relative",
144+
"${workspaceRoot}/bld/debug"
145+
]
146+
}
102147
}
103148
}
104149
]

meson.build

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Distributed under the Boost Software License, Version 1.0. (See accompanying
44
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
55

6-
project('QVM', 'cpp', default_options : ['cpp_std=c++03', 'b_pch=false'], license : 'boost')
6+
project('QVM', 'cpp', default_options : ['cpp_std=c++11', 'b_pch=false'], license : 'boost')
77

88
option_qvm_header_mode = get_option('qvm_header_mode')
99
option_enable_unit_tests = get_option('qvm_enable_unit_tests')
@@ -15,6 +15,15 @@ if not meson.is_subproject()
1515
add_global_arguments(
1616
'-fdiagnostics-absolute-paths',
1717
'-Wno-dangling-else',
18+
'-Wno-conversion',
19+
language:'cpp' )
20+
elif compiler_id=='gcc'
21+
add_global_arguments(
22+
'-Wno-conversion',
23+
language:'cpp' )
24+
elif compiler_id=='msvc'
25+
add_global_arguments(
26+
'/wd4244',
1827
language:'cpp' )
1928
endif
2029
endif

0 commit comments

Comments
 (0)