From 28eaf0ae8b6eba53d164d5a642202e16cbd42ff8 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 8 Aug 2020 20:04:46 -0700
Subject: [PATCH] add libzip to the build

---
 CMakeLists.txt         | 11 ++++++++---
 depends/CMakeLists.txt |  9 +++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c9ada74a..490e1bb55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -425,11 +425,16 @@ if(BUILD_LIBRARY)
             IMPORTED_LOCATION ${XLSXIO_INSTALL_DIR}/lib/libxlsxio_read.a)
     add_dependencies(xlsxio_read xlsxio_project)
 
+    ExternalProject_Get_Property(libzip_project INSTALL_DIR)
+    set(LIBZIP_INSTALL_DIR ${INSTALL_DIR})
+    include_directories(${LIBZIP_INSTALL_DIR}/include)
+    add_library(zip STATIC IMPORTED)
+    set_target_properties(zip PROPERTIES
+            IMPORTED_LOCATION ${LIBZIP_INSTALL_DIR}/lib64/libzip.a)
+    add_dependencies(zip libzip_project)
+
     # just pull from the system until I figure out how to integrate these deps
     # into the build
-    add_library(zip SHARED IMPORTED)
-    set_target_properties(zip PROPERTIES
-            IMPORTED_LOCATION /usr/lib64/libzip.so)
     add_library(expat SHARED IMPORTED)
     set_target_properties(expat PROPERTIES
             IMPORTED_LOCATION /usr/lib64/libexpat.so)
diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index e43c80266..d5669080e 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -18,6 +18,15 @@ option(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependenc
 add_subdirectory(clsocket)
 ide_folder(clsocket "Depends")
 
+set(LIBZIP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzip)
+ExternalProject_Add(libzip_project
+    PREFIX      libzip
+    SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libzip
+    INSTALL_DIR ${LIBZIP_INSTALL_DIR}
+    BUILD_BYPRODUCTS ${LIBZIP_INSTALL_DIR}/lib64/libzip.a
+    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${LIBZIP_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DENABLE_BZIP2=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_LZMA=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+)
+
 set(XLSXIO_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/xlsxio)
 ExternalProject_Add(xlsxio_project
     PREFIX      xlsxio