mirror of
https://github.com/wolfpld/tracy.git
synced 2024-11-10 10:41:50 +00:00
Merge pull request #370 from tmayoff/meson-msvc
Removing C++11 option from msvc in meson build
This commit is contained in:
commit
d9684dcb71
10
meson.build
10
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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user