From 6dbee297ce65d8c3e75cf61f51258810aa671696 Mon Sep 17 00:00:00 2001
From: Sebastian Messmer <messmer@cryfs.org>
Date: Sat, 19 May 2018 12:40:20 -0700
Subject: [PATCH] Use cryptopp from vendor/ instead of system

---
 src/cpp-utils/CMakeLists.txt   |  4 +---
 vendor/cryptopp/CMakeLists.txt | 14 +++++++++++---
 vendor/cryptopp/dummy.cpp      |  0
 3 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 vendor/cryptopp/dummy.cpp

diff --git a/src/cpp-utils/CMakeLists.txt b/src/cpp-utils/CMakeLists.txt
index bf12ed75..61d5d55e 100644
--- a/src/cpp-utils/CMakeLists.txt
+++ b/src/cpp-utils/CMakeLists.txt
@@ -63,9 +63,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_THREAD_LIBS_INIT})
 
 target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS})
 
-# TODO From Crypto++ 5.7 on, it should support cmake with find_package() instead of find_library().
-find_library_with_path(CryptoPP cryptopp CRYPTOPP_LIB_PATH)
-target_link_libraries(${PROJECT_NAME} PUBLIC ${CryptoPP} scrypt spdlog)
+target_link_libraries(${PROJECT_NAME} PUBLIC scrypt spdlog cryptopp)
 
 target_add_boost(${PROJECT_NAME} filesystem system thread)
 target_enable_style_warnings(${PROJECT_NAME})
diff --git a/vendor/cryptopp/CMakeLists.txt b/vendor/cryptopp/CMakeLists.txt
index 415dea68..f8c9550a 100644
--- a/vendor/cryptopp/CMakeLists.txt
+++ b/vendor/cryptopp/CMakeLists.txt
@@ -1,4 +1,12 @@
-# Don't build cryptopp test cases
-set(BUILD_TESTING OFF)
+project(mycryptopp)
 
-add_subdirectory(cryptopp)
+set(BUILD_TESTING OFF)
+set(BUILD_DOCUMENTATION OFF)
+set(BUILD_SHARED OFF)
+set(BUILD_STATIC ON)
+add_subdirectory(cryptopp EXCLUDE_FROM_ALL)
+
+
+add_library(cryptopp dummy.cpp)
+target_link_libraries(cryptopp PRIVATE cryptopp-static)
+target_include_directories(cryptopp SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/vendor/cryptopp/dummy.cpp b/vendor/cryptopp/dummy.cpp
new file mode 100644
index 00000000..e69de29b