yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8273 from davidhorstmann-arm:target-prefix-3rdparty

Browse source 
Add MBEDTLS_TARGET_PREFIX to 3rdparty CMake
This commit is contained in:
Minos Galanakis 2023-10-04 14:44:38 +01:00
commit 8f4c19a680
3 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
3rdparty/everest/CMakeLists.txt vendored
View file

@ -1,9 +1,11 @@
add_library(everest set(everest_target "${MBEDTLS_TARGET_PREFIX}everest")
add_library(${everest_target}
library/everest.c library/everest.c
library/x25519.c library/x25519.c
library/Hacl_Curve25519_joined.c) library/Hacl_Curve25519_joined.c)
target_include_directories(everest target_include_directories(${everest_target}
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${MBEDTLS_DIR}/include> $<BUILD_INTERFACE:${MBEDTLS_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
@ -34,7 +36,7 @@ if(INSTALL_MBEDTLS_HEADERS)
endif(INSTALL_MBEDTLS_HEADERS) endif(INSTALL_MBEDTLS_HEADERS)
install(TARGETS everest install(TARGETS ${everest_target}
EXPORT MbedTLSTargets EXPORT MbedTLSTargets
DESTINATION ${CMAKE_INSTALL_LIBDIR} DESTINATION ${CMAKE_INSTALL_LIBDIR}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)

8
3rdparty/p256-m/CMakeLists.txt vendored
View file

@ -1,8 +1,10 @@
add_library(p256m set(p256m_target ${MBEDTLS_TARGET_PREFIX}p256m)
add_library(${p256m_target}
p256-m_driver_entrypoints.c p256-m_driver_entrypoints.c
p256-m/p256-m.c) p256-m/p256-m.c)
target_include_directories(p256m target_include_directories(${p256m_target}
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/p256-m> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/p256-m>
$<BUILD_INTERFACE:${MBEDTLS_DIR}/include> $<BUILD_INTERFACE:${MBEDTLS_DIR}/include>
@ -32,7 +34,7 @@ if(INSTALL_MBEDTLS_HEADERS)
endif(INSTALL_MBEDTLS_HEADERS) endif(INSTALL_MBEDTLS_HEADERS)
install(TARGETS p256m install(TARGETS ${p256m_target}
EXPORT MbedTLSTargets EXPORT MbedTLSTargets
DESTINATION ${CMAKE_INSTALL_LIBDIR} DESTINATION ${CMAKE_INSTALL_LIBDIR}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)

19
library/CMakeLists.txt
View file

@ -268,17 +268,20 @@ if(USE_STATIC_MBEDTLS_LIBRARY AND USE_SHARED_MBEDTLS_LIBRARY)
${mbedtls_static_target}) ${mbedtls_static_target})
endif() endif()
set(p256m_target "${MBEDTLS_TARGET_PREFIX}p256m")
set(everest_target "${MBEDTLS_TARGET_PREFIX}everest")
if(USE_STATIC_MBEDTLS_LIBRARY) if(USE_STATIC_MBEDTLS_LIBRARY)
add_library(${mbedcrypto_static_target} STATIC ${src_crypto}) add_library(${mbedcrypto_static_target} STATIC ${src_crypto})
set_target_properties(${mbedcrypto_static_target} PROPERTIES OUTPUT_NAME mbedcrypto) set_target_properties(${mbedcrypto_static_target} PROPERTIES OUTPUT_NAME mbedcrypto)
target_link_libraries(${mbedcrypto_static_target} PUBLIC ${libs}) target_link_libraries(${mbedcrypto_static_target} PUBLIC ${libs})
if(TARGET everest) if(TARGET ${everest_target})
target_link_libraries(${mbedcrypto_static_target} PUBLIC everest) target_link_libraries(${mbedcrypto_static_target} PUBLIC ${everest_target})
endif() endif()
if(TARGET p256m) if(TARGET ${p256m_target})
target_link_libraries(${mbedcrypto_static_target} PUBLIC p256m) target_link_libraries(${mbedcrypto_static_target} PUBLIC ${p256m_target})
endif() endif()
add_library(${mbedx509_static_target} STATIC ${src_x509}) add_library(${mbedx509_static_target} STATIC ${src_x509})
@ -296,12 +299,12 @@ if(USE_SHARED_MBEDTLS_LIBRARY)
set_target_properties(${mbedcrypto_target} PROPERTIES VERSION 3.5.0 SOVERSION 14) set_target_properties(${mbedcrypto_target} PROPERTIES VERSION 3.5.0 SOVERSION 14)
target_link_libraries(${mbedcrypto_target} PUBLIC ${libs}) target_link_libraries(${mbedcrypto_target} PUBLIC ${libs})
if(TARGET everest) if(TARGET ${everest_target})
target_link_libraries(${mbedcrypto_target} PUBLIC everest) target_link_libraries(${mbedcrypto_target} PUBLIC ${everest_target})
endif() endif()
if(TARGET p256m) if(TARGET ${p256m_target})
target_link_libraries(${mbedcrypto_target} PUBLIC p256m) target_link_libraries(${mbedcrypto_target} PUBLIC ${p256m_target})
endif() endif()
add_library(${mbedx509_target} SHARED ${src_x509}) add_library(${mbedx509_target} SHARED ${src_x509})