From e93e8ed09160c4fcad8c6544bc1b1bd16b111d31 Mon Sep 17 00:00:00 2001
From: Thomas Fussell <thomas.fussell@gmail.com>
Date: Fri, 10 Mar 2017 19:00:10 -0500
Subject: [PATCH] fix linking

---
 CMakeLists.txt             | 5 +----
 source/CMakeLists.txt      | 3 +++
 tests/CMakeLists.txt       | 1 -
 third-party/CMakeLists.txt | 2 --
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41da32f8..5a5e6575 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,14 +26,11 @@ if(BENCHMARKS)
 endif()
 
 find_package(PythonInterp)
-find_package(CxxTest)
 
-if(PYTHONINTERP_FOUND AND CXXTEST_FOUND)
+if(PYTHONINTERP_FOUND)
     add_subdirectory(tests)
 elseif(NOT PYTHONINTERP_FOUND)
     message("Python couldn't be found in the current PATH but is required for building tests. Tests will be skipped for now.")
-else()
-    message("CxxTest couldn't be found in the current PATH but is required for building tests. Tests will be skipped for now.")
 endif()
 
 add_subdirectory(source)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 9dcf9e5b..907a9a87 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -11,6 +11,9 @@ set(PROJECT_DESCRIPTION "cross-platform user-friendly xlsx library for C++14")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../third-party")
 
+find_package(ZLIB REQUIRED)
+find_package(CryptoPP REQUIRED)
+
 if(APPLE)
     option(FRAMEWORK "Set to ON to package dylib and headers into a .framework, OSX only" OFF)
 endif()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3711a047..ab9dd697 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -71,7 +71,6 @@ 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}
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index 11e1fa2e..464c7362 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.2)
 project(xlnt.third-party)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}")
-
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libstudxml)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cxxtest)