Add building support for SwiftPM

.gitignore

@@ -79,6 +79,9 @@
 !/OpenXLSX/external/*
 !/OpenXLSX/headers
 !/OpenXLSX/headers/*
+!/OpenXLSX/module.modulemap
+!/OpenXLSX/swiftpm
+!/OpenXLSX/swiftpm/*
 !/OpenXLSX/OpenXLSXConfig.cmake
 !/OpenXLSX/OpenXLSX.hpp
 !/OpenXLSX/sources
@@ -103,3 +106,5 @@
 !/Tests/catch/*.hpp
 !/Tests/CMakeLists.txt
 !/Tests/*.cpp
+
+!/Package.swift

OpenXLSX/CMakeLists.txt

@@ -185,6 +185,7 @@ if ("${OPENXLSX_LIBRARY_TYPE}" STREQUAL "SHARED")
 
 endif()
 
+target_compile_definitions(OpenXLSX PUBLIC OPENXLSX_CMAKE)
 
 if (OPENXLSX_ENABLE_NOWIDE)
     target_compile_definitions(OpenXLSX PRIVATE ENABLE_NOWIDE)

OpenXLSX/external/zippy/zippy.hpp

@@ -633,11 +633,16 @@ namespace ns_miniz
 #endif
 #pragma once
 
+} // namespace ns_miniz
+
 #include <assert.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
+namespace ns_miniz
+{
+
     /* ------------------- Types and macros */
     typedef unsigned char mz_uint8;
 
@@ -4657,8 +4662,20 @@ namespace ns_miniz
 #        define MZ_FILE void*
 #    else
 
+#    ifdef __cplusplus
+    }
+#    endif
+} // namespace ns_miniz
+
 #        include <sys/stat.h>
 
+namespace ns_miniz
+{
+#    ifdef __cplusplus
+    extern "C"
+    {
+#    endif
+
 #        if defined(_MSC_VER) || defined(__MINGW64__)
     static FILE* mz_fopen(const char* pFilename, const char* pMode)
     {
@@ -4738,8 +4755,20 @@ namespace ns_miniz
 #        elif defined(__APPLE__)
 #            ifndef MINIZ_NO_TIME
 
+#    ifdef __cplusplus
+    }
+#    endif
+} // namespace ns_miniz
+
 #                include <utime.h>
 
+namespace ns_miniz
+{
+#    ifdef __cplusplus
+    extern "C"
+    {
+#    endif
+
 #            endif
 
 #            define MZ_FOPEN(f, m) FILESYSTEM_NAMESPACE::fopen(f, m)

OpenXLSX/headers/IZipArchive.hpp

@@ -53,7 +53,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #endif // _MSC_VER
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 
 #include <memory>
 #include <string>

OpenXLSX/headers/XLCell.hpp

@@ -57,7 +57,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <memory>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLCellReference.hpp"
 #include "XLCellValue.hpp"
 #include "XLFormula.hpp"

OpenXLSX/headers/XLCellIterator.hpp

@@ -54,7 +54,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 
 #include <algorithm>
 
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLCell.hpp"
 #include "XLCellReference.hpp"
 #include "XLIterator.hpp"

OpenXLSX/headers/XLCellRange.hpp

@@ -56,7 +56,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <memory>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLCell.hpp"
 #include "XLCellIterator.hpp"
 #include "XLCellReference.hpp"

OpenXLSX/headers/XLCellReference.hpp

@@ -58,7 +58,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <utility>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 
 namespace OpenXLSX
 {

OpenXLSX/headers/XLCellValue.hpp

@@ -60,7 +60,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <variant>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLDateTime.hpp"
 #include "XLException.hpp"
 #include "XLXmlParser.hpp"

OpenXLSX/headers/XLColor.hpp

@@ -57,7 +57,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <string>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 
 namespace OpenXLSX
 {

OpenXLSX/headers/XLColumn.hpp

@@ -56,7 +56,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <memory>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLStyles.hpp"          // XLStyleIndex
 #include "XLXmlParser.hpp"
 

OpenXLSX/headers/XLComments.hpp

@@ -53,7 +53,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 // #include <variant>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 // #include "XLCell.hpp"
 // #include "XLCellReference.hpp"
 // #include "XLColor.hpp"

OpenXLSX/headers/XLContentTypes.hpp

@@ -59,7 +59,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <vector>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLXmlFile.hpp"
 #include "XLXmlParser.hpp"
 

OpenXLSX/headers/XLDateTime.hpp

@@ -56,7 +56,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <ctime>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLException.hpp"
 
 // ========== CLASS AND ENUM TYPE DEFINITIONS ========== //

OpenXLSX/headers/XLDocument.hpp

@@ -59,7 +59,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 
 // ===== OpenXLSX Includes ===== //
 #include "IZipArchive.hpp"
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLCommandQuery.hpp"
 #include "XLContentTypes.hpp"
 #include "XLProperties.hpp"

OpenXLSX/headers/XLException.hpp

@@ -57,7 +57,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <string>       // std::string - Issue #278 should be resolved by this
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 
 namespace OpenXLSX
 {

OpenXLSX/headers/XLFormula.hpp

@@ -58,7 +58,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <variant>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLXmlParser.hpp"
 
 // ========== CLASS AND ENUM TYPE DEFINITIONS ========== //

OpenXLSX/headers/XLMergeCells.hpp

@@ -59,7 +59,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <string>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLCellReference.hpp"
 #include "XLXmlParser.hpp" // XMLNode, pugi node types
 

OpenXLSX/headers/XLProperties.hpp

@@ -56,7 +56,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <string>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLXmlFile.hpp"
 
 namespace OpenXLSX

OpenXLSX/headers/XLRelationships.hpp

@@ -58,7 +58,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <vector>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLXmlFile.hpp"
 #include "XLXmlParser.hpp"
 

OpenXLSX/headers/XLRow.hpp

@@ -53,7 +53,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #endif // _MSC_VER
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLRowData.hpp"
 
 // ========== CLASS AND ENUM TYPE DEFINITIONS ========== //

OpenXLSX/headers/XLRowData.hpp

@@ -19,7 +19,7 @@
 #include <vector>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLCell.hpp"
 #include "XLConstants.hpp"
 #include "XLException.hpp"

OpenXLSX/headers/XLSharedStrings.hpp

@@ -58,7 +58,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <string>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLXmlFile.hpp"
 
 namespace OpenXLSX

OpenXLSX/headers/XLSheet.hpp

@@ -59,7 +59,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <variant>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLCell.hpp"
 #include "XLCellReference.hpp"
 #include "XLColor.hpp"

OpenXLSX/headers/XLStyles.hpp

@@ -58,7 +58,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <vector>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLColor.hpp"
 #include "XLXmlFile.hpp"
 #include "XLXmlParser.hpp"

OpenXLSX/headers/XLWorkbook.hpp

@@ -57,7 +57,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <vector>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLXmlFile.hpp"
 
 namespace OpenXLSX

OpenXLSX/headers/XLXmlData.hpp

@@ -57,7 +57,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #include <string>
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLContentTypes.hpp"
 #include "XLXmlParser.hpp"
 

OpenXLSX/headers/XLXmlFile.hpp

@@ -53,7 +53,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #endif // _MSC_VER
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 #include "XLXmlParser.hpp"
 
 namespace OpenXLSX

OpenXLSX/headers/XLXmlParser.hpp

@@ -50,7 +50,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 
 // ===== pugixml.hpp needed for pugi::impl::xml_memory_page_type_mask, pugi::xml_node_type, pugi::char_t, pugi::node_element, pugi::xml_node, pugi::xml_attribute, pugi::xml_document
 #include <external/pugixml/pugixml.hpp> // not sure why the full include path is needed within the header file
-#include <XLException.hpp>
+#include "XLException.hpp"
 
 namespace { // anonymous namespace to define constants / functions that shall not be exported from this module
     constexpr const int XLMaxNamespacedNameLen = 100;

OpenXLSX/headers/XLZipArchive.hpp

@@ -53,7 +53,7 @@ YM      M9  MM    MM MM       MM    MM   d'  `MM.    MM            MM   d'  `MM.
 #endif // _MSC_VER
 
 // ===== OpenXLSX Includes ===== //
-#include "OpenXLSX-Exports.hpp"
+#include "include-exports-header.hpp"
 
 namespace Zippy
 {

OpenXLSX/headers/include-exports-header.hpp

@@ -0,0 +1,5 @@
+#ifdef OPENXLSX_CMAKE
+#include "OpenXLSX-Exports.hpp"
+#else
+#include "swiftpm/OpenXLSX-Exports.hpp"
+#endif

OpenXLSX/module.modulemap

@@ -0,0 +1,6 @@
+module CxxOpenXLSX {
+    header "OpenXLSX.hpp"
+    export *
+    requires cplusplus
+}
+

OpenXLSX/swiftpm/OpenXLSX-Exports.hpp

@@ -0,0 +1,42 @@
+
+#ifndef OPENXLSX_EXPORT_H
+#define OPENXLSX_EXPORT_H
+
+#ifdef OPENXLSX_STATIC_DEFINE
+#  define OPENXLSX_EXPORT
+#  define OPENXLSX_HIDDEN
+#else
+#  ifndef OPENXLSX_EXPORT
+#    ifdef OpenXLSX_EXPORTS
+        /* We are building this library */
+#      define OPENXLSX_EXPORT 
+#    else
+        /* We are using this library */
+#      define OPENXLSX_EXPORT 
+#    endif
+#  endif
+
+#  ifndef OPENXLSX_HIDDEN
+#    define OPENXLSX_HIDDEN 
+#  endif
+#endif
+
+#ifndef OPENXLSX_DEPRECATED
+#  define OPENXLSX_DEPRECATED __attribute__ ((__deprecated__))
+#endif
+
+#ifndef OPENXLSX_DEPRECATED_EXPORT
+#  define OPENXLSX_DEPRECATED_EXPORT OPENXLSX_EXPORT OPENXLSX_DEPRECATED
+#endif
+
+#ifndef OPENXLSX_DEPRECATED_NO_EXPORT
+#  define OPENXLSX_DEPRECATED_NO_EXPORT OPENXLSX_HIDDEN OPENXLSX_DEPRECATED
+#endif
+
+#if 0 /* DEFINE_NO_DEPRECATED */
+#  ifndef OPENXLSX_NO_DEPRECATED
+#    define OPENXLSX_NO_DEPRECATED
+#  endif
+#endif
+
+#endif /* OPENXLSX_EXPORT_H */