From 3a6a17c708bf694c08ec47141f5ddf9ea638b25a Mon Sep 17 00:00:00 2001 From: Steveice10 <1269164+Steveice10@users.noreply.github.com> Date: Thu, 2 Feb 2023 07:26:21 -0800 Subject: [PATCH] externals: Bundle cryptopp as submodule. (#6272) fix https://github.com/citra-emu/citra/issues/6271 --- .gitmodules | 3 +++ externals/CMakeLists.txt | 1 + externals/cryptopp | 1 + 3 files changed, 5 insertions(+) create mode 160000 externals/cryptopp diff --git a/.gitmodules b/.gitmodules index a7f40e62f5..f87afc87d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,3 +58,6 @@ [submodule "cryptopp-cmake"] path = externals/cryptopp-cmake url = https://github.com/abdes/cryptopp-cmake.git +[submodule "cryptopp"] + path = externals/cryptopp + url = https://github.com/weidai11/cryptopp.git diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 12831f343c..3c290347a6 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -32,6 +32,7 @@ add_subdirectory(catch2) set(CRYPTOPP_BUILD_DOCUMENTATION OFF) set(CRYPTOPP_BUILD_TESTING OFF) set(CRYPTOPP_INSTALL OFF) +set(CRYPTOPP_SOURCES "${CMAKE_SOURCE_DIR}/externals/cryptopp") add_subdirectory(cryptopp-cmake) # HACK: The logic to set up the base include directory for CryptoPP does not work with Android SDK CMake 3.22.1. diff --git a/externals/cryptopp b/externals/cryptopp new file mode 160000 index 0000000000..511806c0eb --- /dev/null +++ b/externals/cryptopp @@ -0,0 +1 @@ +Subproject commit 511806c0eba8ba5b5cedd4b4a814e96df92864a6