OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-14 22:50:06 +00:00
Code Issues Projects Releases Wiki Activity

externals: Update cryptopp-cmake and cryptopp. (#7041)

Browse Source
This commit is contained in:
Steveice10 2023-10-17 11:03:03 -07:00 committed by GitHub
parent 2d83fff581
commit 1caf569f16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
externals/CMakeLists.txt vendored
View File

@ -48,20 +48,6 @@ set(CRYPTOPP_INSTALL OFF CACHE BOOL "")
set(CRYPTOPP_SOURCES "${CMAKE_SOURCE_DIR}/externals/cryptopp" CACHE STRING "") set(CRYPTOPP_SOURCES "${CMAKE_SOURCE_DIR}/externals/cryptopp" CACHE STRING "")
add_subdirectory(cryptopp-cmake) 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 "\\$<BUILD_INTERFACE:(.*)/cryptopp>")
message(STATUS "Fixed include path: ${CMAKE_MATCH_1}")
target_include_directories(cryptopp PUBLIC $<BUILD_INTERFACE:${CMAKE_MATCH_1}>)
break()
endif()
endforeach()
endif()
# dds-ktx # dds-ktx
add_library(dds-ktx INTERFACE) add_library(dds-ktx INTERFACE)
target_include_directories(dds-ktx INTERFACE ./dds-ktx) target_include_directories(dds-ktx INTERFACE ./dds-ktx)

2
externals/cryptopp vendored

@ -1 +1 @@
Subproject commit 511806c0eba8ba5b5cedd4b4a814e96df92864a6 Subproject commit af7d1050bf2287072edd629be133da458a3cf978

2
externals/cryptopp-cmake vendored

@ -1 +1 @@
Subproject commit 15798ac9c2611d5c7f9ba832e2c9159bdd8945f2 Subproject commit 9327192b0095dc1f420b2082d37bd427b5750d48