File tree Expand file tree Collapse file tree 4 files changed +5
-2
lines changed
subprojects/packagefiles/spdlog Expand file tree Collapse file tree 4 files changed +5
-2
lines changed Original file line number Diff line number Diff line change 39383938 " spdlog"
39393939 ],
39403940 "versions" : [
3941+ " 1.15.3-4" ,
39413942 " 1.15.3-3" ,
39423943 " 1.15.3-2" ,
39433944 " 1.15.3-1" ,
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ thread_dep = dependency('threads')
1212
1313spdlog_dependencies = [thread_dep]
1414spdlog_compile_args = []
15+ override_cpp = ' cpp_std=c++17'
1516
1617if meson .get_compiler(' cpp' ).has_header_symbol(
1718 ' format' ,
@@ -23,6 +24,7 @@ if meson.get_compiler('cpp').has_header_symbol(
2324 '' ,
2425 required : false ,
2526 )
27+ override_cpp = ' cpp_std=c++20'
2628else
2729 fmt_dep = dependency (
2830 ' fmt' ,
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ spdlog_lib = library(
1919 include_directories : inc,
2020 dependencies : spdlog_dependencies,
2121 cpp_args : spdlog_compile_args,
22- override_options : ' cpp_std=c++17 ' ,
22+ override_options : override_cpp ,
2323 soversion : version_parts[0 ] + ' .' + version_parts[1 ],
2424 version : meson .project_version(),
2525 install : true ,
Original file line number Diff line number Diff line change 5353 executable (
5454 ' tests_exe' ,
5555 test_src,
56- override_options : ' cpp_std=c++17 ' ,
56+ override_options : override_cpp ,
5757 dependencies : [catch2_dep, spdlog_dep],
5858 ),
5959)
You can’t perform that action at this time.
0 commit comments