Fix shared builds

QtExcel · Jun 22, 2022 · 6d1667f · 6d1667f
1 parent d2198a8
commit 6d1667f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
@@ -148,6 +148,9 @@ add_library(QXlsx
 )
 
 add_library(QXlsx::QXlsx ALIAS QXlsx)
+if (BUILD_SHARED_LIBS)
+    target_compile_definitions(QXlsx PUBLIC QXlsx_SHAREDLIB)
+endif()
 
 target_link_libraries(${PROJECT_NAME}
    Qt${QT_VERSION_MAJOR}::Core

diff --git a/QXlsx/QXlsx.pri b/QXlsx/QXlsx.pri
@@ -15,7 +15,7 @@ CONFIG += c++11
 DEFINES += QT_DEPRECATED_WARNINGS
 
 # For DLL visibility
-#DEFINES += QXlsx_EXPORTS
+#DEFINES += QXlsx_SHAREDLIB QXlsx_EXPORTS
 
 # You can also make your code fail to compile if you use deprecated APIs.
 # In order to do so, uncomment the following line.

diff --git a/QXlsx/header/xlsxglobal.h b/QXlsx/header/xlsxglobal.h
@@ -16,10 +16,12 @@
 #include <QStringList>
 #include <QSharedPointer>
 
+#if defined(QXlsx_SHAREDLIB)
 #if defined(QXlsx_EXPORTS)
 #  define QXLSX_EXPORT Q_DECL_EXPORT
-#elif defined (QXlsx_IMPORTS)
+#else
 #  define QXLSX_EXPORT Q_DECL_IMPORT
+#endif
 #else
 #  define QXLSX_EXPORT
 #endif