QUILL_EXPORT fix for windows shared library

odygrd · Jun 2, 2023 · 15e2111 · 15e2111
1 parent 5320c25
commit 15e2111
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/examples/example_logging_to_file.cpp b/examples/example_logging_to_file.cpp
@@ -1,3 +1,4 @@
+// #define QUILL_BUILD_SHARED // if linking against quill.dll
 #include "quill/Quill.h"
 
 static char const* filename = "example_filehandler.log";

diff --git a/quill/CMakeLists.txt b/quill/CMakeLists.txt
@@ -121,6 +121,7 @@ add_library(${TARGET_NAME}::${TARGET_NAME} ALIAS ${TARGET_NAME})
 
 if (BUILD_SHARED_LIBS)
     target_compile_definitions(${TARGET_NAME} PRIVATE -DQUILL_DLL_EXPORT)
+    target_compile_definitions(${TARGET_NAME} PRIVATE -DQUILL_BUILD_SHARED)
     set_property(TARGET ${TARGET_NAME} PROPERTY CXX_VISIBILITY_PRESET default)
     set_property(TARGET ${TARGET_NAME} PROPERTY VISIBILITY_INLINES_HIDDEN OFF)
 endif ()

diff --git a/quill/include/quill/detail/misc/Attributes.h b/quill/include/quill/detail/misc/Attributes.h
@@ -97,9 +97,9 @@
 
 // visibility
 #if defined(_WIN32)
-  #if defined(QUILL_DLL_EXPORT)
+  #if defined(QUILL_DLL_EXPORT) && defined(QUILL_BUILD_SHARED)
     #define QUILL_EXPORT __declspec(dllexport)
-  #else
+  #elif defined(QUILL_BUILD_SHARED)
     #define QUILL_EXPORT __declspec(dllimport)
   #endif
 #elif defined(__GNUC__) || defined(__clang__)