From 414010e7a0928f751d58edd31c85df4895c31e21 Mon Sep 17 00:00:00 2001
From: Daniel Mensinger <daniel@mensinger-ka.de>
Date: Thu, 2 Apr 2020 16:40:44 +0200
Subject: [PATCH] meson: Fix shared library compilation

---
 meson.build | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/meson.build b/meson.build
index fae42bfc..0d1fef1a 100644
--- a/meson.build
+++ b/meson.build
@@ -12,8 +12,10 @@ project('spdlog', ['cpp'],
 # ------------------------
 # ---   Dependencies   ---
 # ------------------------
-dep_list = []
+dep_list     = []
 compile_args = []
+private_args = []
+public_args  = []
 
 # Threads
 dep_list += dependency('threads')
@@ -21,10 +23,13 @@ dep_list += dependency('threads')
 # Check for FMT
 if get_option('external_fmt')
     if not meson.version().version_compare('>=0.49.0')
-    warning('Finding fmt can fail with meson versions before 0.49.0')
+        warning('Finding fmt can fail with meson versions before 0.49.0')
     endif
     dep_list     += dependency('fmt', fallback :  ['fmt', 'fmt_dep'])
     compile_args += '-DSPDLOG_FMT_EXTERNAL'
+else
+    public_args  += ['-DFMT_SHARED']
+    private_args += ['-DFMT_EXPORT']
 endif
 
 if get_option('no_exceptions')
@@ -69,7 +74,9 @@ if get_option('no_atomic_levels')
 endif
 
 compile_args_compiled = compile_args + ['-DSPDLOG_COMPILED_LIB']
-compile_args_ho = compile_args
+compile_args_private  = compile_args_compiled + public_args
+compile_args_public   = compile_args_compiled + private_args
+compile_args_ho       = compile_args
 
 # ------------------------------------
 # ---   Compiled library version   ---
@@ -99,21 +106,25 @@ if get_option('library_type') == 'static'
     dependencies        : dep_list,
     install             : not meson.is_subproject()
     )
+
+    dep_args = compile_args_compiled
 else
     spdlog = shared_library('spdlog',
     spdlog_srcs,
-    cpp_args            : compile_args_compiled,
+    cpp_args            : compile_args_private,
     include_directories : spdlog_inc,
     dependencies        : dep_list,
     install             : not meson.is_subproject(),
     version             : meson.project_version(),
     )
+
+    dep_args = compile_args_public
 endif
 
 spdlog_dep = declare_dependency(
       link_with           : spdlog,
       include_directories : spdlog_inc,
-      compile_args        : compile_args_compiled,
+      compile_args        : dep_args,
       dependencies        : dep_list,
       version             : meson.project_version(),
 )