add support for osx frameworks, move optional into source tree so it can be used in framework

cmake/CMakeLists.txt

@@ -8,6 +8,7 @@ project(xlnt)
 
 option(SHARED "Set to OFF to not build shared libraries" ON)
 option(STATIC "Set to ON to build static libraries" OFF)
+option(FRAMEWORK "Set to ON to package dylib and headers into a .framework, OSX only" OFF)
 option(DEBUG "Set to ON to for debug configuration" OFF)
 option(BUILD_EXAMPLES "Build examples" OFF)
 option(BUILD_TESTS "Build tests runner" OFF)

cmake/xlnt.cmake

@@ -30,7 +30,6 @@ include_directories(../source)
 include_directories(../third-party/miniz)
 include_directories(../third-party/pugixml/src)
 include_directories(../third-party/utfcpp/source)
-include_directories(../third-party/Optional)
 
 FILE(GLOB ROOT_HEADERS ../include/xlnt/*.hpp)
 FILE(GLOB CELL_HEADERS ../include/xlnt/cell/*.hpp)
@@ -87,6 +86,18 @@ if(SHARED)
 	SOVERSION ${PROJECT_VERSION}
 	INSTALL_NAME_DIR "${LIB_DEST_DIR}"
     )
+
+    if(FRAMEWORK)
+        add_custom_command(
+            TARGET xlnt.shared
+            POST_BUILD
+            COMMAND mkdir -p "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.framework/Versions/${PROJECT_VERSION_FULL}/Headers"
+            COMMAND cp -R ../include/xlnt/* "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.framework/Versions/${PROJECT_VERSION_FULL}/Headers"
+            COMMAND cp "../lib/lib${PROJECT_NAME}.${PROJECT_VERSION_FULL}.dylib" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.framework/Versions/${PROJECT_VERSION_FULL}/xlnt"
+            COMMAND cd "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.framework/Versions" && ln -s "${PROJECT_VERSION_FULL}" Current
+            COMMAND cd "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.framework" && ln -s Versions/Current/* ./
+        )
+    endif()
 endif()
 
 if(STATIC)

configure

@@ -81,6 +81,8 @@ def parse_args(args):
             options['SHARED'] = 0
         elif option == '--disable-static':
             options['STATIC'] = 0
+        elif option == '--enable-framework':
+            options['FRAMEWORK'] = 1
         elif option == '--enable-tests':
             options['BUILD_TESTS'] = 1
         elif option == '--enable-coverage':

include/xlnt/styles/border.hpp

@@ -25,12 +25,12 @@
 
 #include <cstddef>
 #include <functional>
-#include <optional.hpp>
 
 #include <xlnt/xlnt_config.hpp>
 #include <xlnt/styles/diagonal_direction.hpp>
 #include <xlnt/styles/side.hpp>
 #include <xlnt/utils/hashable.hpp>
+#include <xlnt/utils/optional.hpp>
 
 namespace xlnt {
 

include/xlnt/styles/fill.hpp

@@ -23,10 +23,9 @@
 // @author: see AUTHORS file
 #pragma once
 
-#include <optional.hpp>
-
 #include <xlnt/xlnt_config.hpp>
 #include <xlnt/styles/color.hpp>
+#include <xlnt/utils/optional.hpp>
 
 namespace xlnt {
 

include/xlnt/styles/side.hpp

@@ -24,12 +24,12 @@
 #pragma once
 
 #include <cstddef>
-#include <optional.hpp>
 
 #include <xlnt/xlnt_config.hpp>
 #include <xlnt/styles/border_style.hpp>
 #include <xlnt/styles/color.hpp>
 #include <xlnt/utils/hashable.hpp>
+#include <xlnt/utils/optional.hpp>
 
 namespace xlnt {