Skip to content

Commit f3e50e0

Browse files
committed
fix: fix linker errors in the newest MSVC releases
1 parent ee45a78 commit f3e50e0

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/src/meson.build b/src/meson.build
2+
index 969963c..dc11467 100644
3+
--- a/src/meson.build
4+
+++ b/src/meson.build
5+
@@ -13,12 +13,16 @@ endif
6+
7+
version_parts = meson.project_version().split('.')
8+
9+
+cpp = meson.get_compiler('cpp')
10+
+private_arguments = cpp.get_supported_arguments('/IGNORE:4275')
11+
+
12+
+
13+
spdlog_lib = library(
14+
'spdlog',
15+
src,
16+
include_directories: inc,
17+
dependencies: spdlog_dependencies,
18+
- cpp_args: spdlog_compile_args,
19+
+ cpp_args: spdlog_compile_args + private_arguments,
20+
soversion: version_parts[0] + '.' + version_parts[1],
21+
version: meson.project_version(),
22+
install: true,

subprojects/spdlog.wrap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ patch_url = https://wrapdb.mesonbuild.com/v2/spdlog_1.15.2-3/get_patch
88
patch_hash = d5ab078661f571ef5113a8e4bc5c4121e16c044e7772a24b44b1ca8f3ee7c6cb
99
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/spdlog_1.15.2-3/spdlog-1.15.2.tar.gz
1010
wrapdb_version = 1.15.2-3
11-
diff_files = spdlog_1.15.2_fmt_11.2.0_compatibility.diff
11+
diff_files = spdlog_1.15.2_fmt_11.2.0_compatibility.diff,spdlog_1.15.2_linker_errors_msvc.diff
1212

1313
[provide]
1414
spdlog = spdlog_dep

0 commit comments

Comments
 (0)