From 27d8f2a65c3d55abc74562fbfe80b0ead9e4275f Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Thu, 21 Apr 2022 19:47:36 -0400 Subject: [PATCH] Removing c++11 option from msvc --- meson.build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 5c349167..55834747 100644 --- a/meson.build +++ b/meson.build @@ -141,17 +141,23 @@ tracy_src = [ tracy_public_include_dirs = include_directories('.') +compiler = meson.get_compiler('cpp') +override_options = [] +if compiler.get_id() != 'msvc' + override_options += 'cpp_std=c++11' +endif + if tracy_shared_libs tracy = shared_library('tracy', tracy_src, tracy_header_files, dependencies : [ threads_dep ], include_directories : tracy_public_include_dirs, - override_options : [ 'cpp_std=c++11' ], + override_options : override_options, install : true) else tracy = static_library('tracy', tracy_src, tracy_header_files, dependencies : [ threads_dep ], include_directories : tracy_public_include_dirs, - override_options : [ 'cpp_std=c++11' ], + override_options : override_options, install : true) endif