From c52e6c92b08d28048047fa5642f16530bc81c5d7 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 10 Nov 2025 11:48:06 +0200 Subject: Add import std support to MSVC. --- test cases/common/286 importstd/meson.build | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'test cases') diff --git a/test cases/common/286 importstd/meson.build b/test cases/common/286 importstd/meson.build index d5221cd96..b5dd440bd 100644 --- a/test cases/common/286 importstd/meson.build +++ b/test cases/common/286 importstd/meson.build @@ -1,10 +1,23 @@ -project('importstd', 'cpp', default_options: {'cpp_importstd': 'true', - 'cpp_std': 'c++23'}) +project('importstd', 'cpp', default_options: {'cpp_importstd': 'true', + 'cpp_std': 'c++latest,c++23,c++20'}) cpp = meson.get_compiler('cpp') -if cpp.get_id() == 'gcc' and cpp.version().version_compare('>=15.1') - istd_supported = true +cpp_id = cpp.get_id() +cpp_version = cpp.version() + +if cpp_id == 'gcc' and cpp_version.version_compare('>=15.1') + if host_machine.system() == 'windows' + istd_supported = cpp_version.version_compare('>=15.3') + else + if cpp_version.version_compare('=15.2.0') or cpp_version.version_compare('>=15.3.0') + istd_supported = true + else + istd_supported = false + endif + endif +elif cpp_id == 'msvc' and cpp_version.version_compare('>=19.44.35219') + istd_supported = get_option('backend') == 'ninja' else istd_supported = false endif -- cgit v1.2.3