From 1caf569f161179a1476b150b5f8cd33e64acbec4 Mon Sep 17 00:00:00 2001 From: Steveice10 <1269164+Steveice10@users.noreply.github.com> Date: Tue, 17 Oct 2023 11:03:03 -0700 Subject: [PATCH] externals: Update cryptopp-cmake and cryptopp. (#7041) --- externals/CMakeLists.txt | 14 -------------- externals/cryptopp | 2 +- externals/cryptopp-cmake | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 527929b156..649f1c2f8a 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -48,20 +48,6 @@ set(CRYPTOPP_INSTALL OFF CACHE BOOL "") set(CRYPTOPP_SOURCES "${CMAKE_SOURCE_DIR}/externals/cryptopp" CACHE STRING "") 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. -# Until there is a fixed version available, this code will detect and add in the proper include if it does not exist. -if(ANDROID) - message(STATUS "Applying CryptoPP include fix.") - get_target_property(CRYPTOPP_INCLUDES cryptopp INTERFACE_INCLUDE_DIRECTORIES) - foreach(CRYPTOPP_INCLUDE ${CRYPTOPP_INCLUDES}) - if("${CRYPTOPP_INCLUDE}" MATCHES "\\$") - message(STATUS "Fixed include path: ${CMAKE_MATCH_1}") - target_include_directories(cryptopp PUBLIC $) - break() - endif() - endforeach() -endif() - # dds-ktx add_library(dds-ktx INTERFACE) target_include_directories(dds-ktx INTERFACE ./dds-ktx) diff --git a/externals/cryptopp b/externals/cryptopp index 511806c0eb..af7d1050bf 160000 --- a/externals/cryptopp +++ b/externals/cryptopp @@ -1 +1 @@ -Subproject commit 511806c0eba8ba5b5cedd4b4a814e96df92864a6 +Subproject commit af7d1050bf2287072edd629be133da458a3cf978 diff --git a/externals/cryptopp-cmake b/externals/cryptopp-cmake index 15798ac9c2..9327192b00 160000 --- a/externals/cryptopp-cmake +++ b/externals/cryptopp-cmake @@ -1 +1 @@ -Subproject commit 15798ac9c2611d5c7f9ba832e2c9159bdd8945f2 +Subproject commit 9327192b0095dc1f420b2082d37bd427b5750d48