From 679ca41da8739aad216fd28735b30ef08903011d Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 9 Aug 2020 21:22:17 -0700
Subject: [PATCH] make sure xlsxio knows to link statically

---
 depends/CMakeLists.txt | 3 +--
 plugins/xlsxreader.cpp | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 69ce40ae3..a2eafb052 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -72,10 +72,9 @@ set(XLSXIO_LIB ${XLSXIO_INSTALL_DIR}/lib/${LIB_PREFIX}xlsxio_read${LIB_SUFFIX})
 set(XLSXIO_LIB ${XLSXIO_LIB} PARENT_SCOPE)
 ExternalProject_Add(xlsxio_project
     PREFIX      xlsxio
+    DEPENDS     libexpat_project libzip_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/xlsxio
     INSTALL_DIR ${XLSXIO_INSTALL_DIR}
     BUILD_BYPRODUCTS ${XLSXIO_LIB}
     CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DEXPAT_LIBRARIES=${LIBEXPAT_LIB} -DEXPAT_INCLUDE_DIRS=${LIBEXPAT_INSTALL_DIR}/include -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 )
-add_dependencies(xlsxio_project libexpat_project)
-add_dependencies(xlsxio_project libzip_project)
diff --git a/plugins/xlsxreader.cpp b/plugins/xlsxreader.cpp
index 9c773718d..fb5039465 100644
--- a/plugins/xlsxreader.cpp
+++ b/plugins/xlsxreader.cpp
@@ -37,6 +37,7 @@
  *  return true;
  */
 
+#define BUILD_XLSXIO_STATIC
 #include <xlsxio_read.h>
 
 #include "DataFuncs.h"