Skip to content

Commit 8181576

Browse files
judemillekjellahl
authored andcommitted
fix: don't check MSVC version for non-MSVC cl
1 parent d818694 commit 8181576

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

meson.build

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ project_build_root = meson.current_build_dir()
4141
cpp_compiler = meson.get_compiler('cpp')
4242
cpp_compiler_id = cpp_compiler.get_id()
4343
is_msvc = cpp_compiler_id == 'msvc' or cpp_compiler_id.endswith('-cl')
44+
is_cl_impersonator = is_msvc and cpp_compiler_id != 'msvc'
4445
python3 = find_program('python3', version: '>=3.7')
4546

4647
# MSVC: We currently do not support shared and static builds at the,
@@ -119,7 +120,7 @@ benchmark_dep = dependency('boost', modules: ['system', 'timer'],
119120
version: '>=1.20.0', required: do_benchmark)
120121
can_benchmark = benchmark_dep.found()
121122

122-
if is_msvc
123+
if is_msvc and not is_cl_impersonator
123124
# We must have Visual Studio 2017 15.7 or later...
124125
assert(cpp_compiler.version().split('.')[0].to_int() >= 19 and \
125126
cpp_compiler.version().split('.')[1].to_int() >= 15,

0 commit comments

Comments
 (0)