From 9cdf31065ccedfd92b32b6c7b75bcf2dce9c611c Mon Sep 17 00:00:00 2001
From: Thomas Fussell <thomas.fussell@gmail.com>
Date: Tue, 28 Feb 2017 00:00:25 -0500
Subject: [PATCH] improve third-party lib handling for vcpkg

---
 .gitmodules                                 | 3 +++
 source/detail/xlsx_crypto.hpp               | 3 ++-
 source/workbook/tests/test_consume_xlsx.hpp | 4 ++--
 tests/CMakeLists.txt                        | 7 +++++--
 third-party/CMakeLists.txt                  | 6 ------
 third-party/cxxtest                         | 1 +
 6 files changed, 13 insertions(+), 11 deletions(-)
 create mode 160000 third-party/cxxtest

diff --git a/.gitmodules b/.gitmodules
index b5aa2744..627715b2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,3 +3,6 @@
     url = http://scm.codesynthesis.com/libstudxml/libstudxml.git
     branch = master
     ignore = dirty
+[submodule "third-party/cxxtest"]
+	path = third-party/cxxtest
+	url = https://github.com/CxxTest/cxxtest
diff --git a/source/detail/xlsx_crypto.hpp b/source/detail/xlsx_crypto.hpp
index 1362f5d8..39767cae 100644
--- a/source/detail/xlsx_crypto.hpp
+++ b/source/detail/xlsx_crypto.hpp
@@ -23,6 +23,7 @@
 
 #include <array>
 
+#include <xlnt/xlnt_config.hpp>
 #include <xlnt/utils/exceptions.hpp>
 #include <xlnt/workbook/workbook.hpp>
 #include <detail/constants.hpp>
@@ -50,7 +51,7 @@ enum class hash_algorithm
     whirlpool
 };
 
-struct crypto_helper
+struct XLNT_API crypto_helper
 {
     static const std::size_t segment_length;
 
diff --git a/source/workbook/tests/test_consume_xlsx.hpp b/source/workbook/tests/test_consume_xlsx.hpp
index c18c13bb..a29dd7dc 100644
--- a/source/workbook/tests/test_consume_xlsx.hpp
+++ b/source/workbook/tests/test_consume_xlsx.hpp
@@ -56,8 +56,8 @@ public:
 
 #ifndef __MINGW32__
         xlnt::workbook wb2;
-        const auto path = U8STRING_LITERAL(XLNT_TEST_DATA_DIR) u8"/9_unicode_filename_Λ.xlsx";
-        wb2.load(path);
+        const auto path2 = U8STRING_LITERAL(XLNT_TEST_DATA_DIR) u8"/9_unicode_filename_Λ.xlsx";
+        wb2.load(path2);
         TS_ASSERT_EQUALS(wb2.active_sheet().cell("A1").value<std::string>(), "unicode!");
 #endif
     }
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e2ec9b63..14d38e01 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -8,6 +8,10 @@ if(NOT COMBINED_PROJECT)
     add_subdirectory(${LIBRARY_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/source)
 endif()
 
+set(CXXTEST_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../third-party/cxxtest)
+set(CXXTEST_PYTHON_TESTGEN_EXECUTABLE ${CXXTEST_ROOT_DIR}/bin/cxxtestgen)
+set(CXXTEST_INCLUDE_DIR ${CXXTEST_ROOT_DIR})
+
 file(GLOB CELL_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/../source/cell/tests/test_*.hpp)
 file(GLOB CHARTS_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/../source/charts/tests/test_*.hpp)
 file(GLOB CHARTSHEET_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/../source/chartsheet/tests/test_*.hpp)
@@ -73,10 +77,9 @@ else()
 endif()
 
 find_package(PythonInterp REQUIRED)
-find_package(CxxTest REQUIRED)
 
 add_custom_command(OUTPUT ${RUNNER}
-    COMMAND ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE} --runner=ErrorPrinter -o ${RUNNER} ${TESTS}
+    COMMAND ${PYTHON_EXECUTABLE} ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE} --runner=ErrorPrinter -o ${RUNNER} ${TESTS}
     DEPENDS ${TESTS}
     COMMENT "Generating test runner ${RUNNER}")
 
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index 1dd312e0..a07e2b59 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 3.2)
 project(xlnt.third-party)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
-find_package(ZLIB REQUIRED)
-find_package(CryptoPP REQUIRED)
-find_package(CxxTest REQUIRED)
-
 set(LIBSTUDXML_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libstudxml)
 
 set(LIBSTUDXML 
@@ -24,8 +20,6 @@ set(LIBSTUDXML
 set(EXPAT
     ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmlparse.c
     ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmlrole.c
-#    ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmltok_impl.c
-#    ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmltok_ns.c
     ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/xmltok.c
     ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/ascii.h
     ${LIBSTUDXML_ROOT_DIR}/xml/details/expat/asciitab.h
diff --git a/third-party/cxxtest b/third-party/cxxtest
new file mode 160000
index 00000000..191adddb
--- /dev/null
+++ b/third-party/cxxtest
@@ -0,0 +1 @@
+Subproject commit 191adddb3876ab389c0c856e1c03874bf70f8ee4