mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-29 22:20:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename export MbedTLSTargets to TF-PSA-CryptoTargets

Browse Source 
Keep installations on MbedTLSTargets export
crypto libraries for the sake of mbedtls.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
Ronald Cron 2024-10-11 19:39:49 +02:00
parent 2609fe9155
commit ba850f3207
5 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tf-psa-crypto/TF-PSA-Crypto.cmake
View File

@ -454,12 +454,12 @@ if(NOT DISABLE_PACKAGE_CONFIG_AND_INSTALL)
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/TF-PSA-Crypto") DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/TF-PSA-Crypto")
export( export(
EXPORT MbedTLSTargets EXPORT TF-PSA-CryptoTargets
NAMESPACE TF-PSA-Crypto:: NAMESPACE TF-PSA-Crypto::
FILE "cmake/TF-PSA-CryptoTargets.cmake") FILE "cmake/TF-PSA-CryptoTargets.cmake")
install( install(
EXPORT MbedTLSTargets EXPORT TF-PSA-CryptoTargets
NAMESPACE TF-PSA-Crypto:: NAMESPACE TF-PSA-Crypto::
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/TF-PSA-Crypto" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/TF-PSA-Crypto"
FILE "TF-PSA-CryptoTargets.cmake") FILE "TF-PSA-CryptoTargets.cmake")

9
tf-psa-crypto/core/CMakeLists.txt
View File

@ -127,7 +127,7 @@ if(USE_SHARED_TF_PSA_CRYPTO_LIBRARY)
endif(USE_SHARED_TF_PSA_CRYPTO_LIBRARY) endif(USE_SHARED_TF_PSA_CRYPTO_LIBRARY)
foreach(target IN LISTS target_libraries) foreach(target IN LISTS target_libraries)
add_library(MbedTLS::${target} ALIAS ${target}) # add_subdirectory support add_library(TF-PSA-Crypto::${target} ALIAS ${target}) # add_subdirectory support
# Include public header files include/, drivers/builtin/include/ and # Include public header files include/, drivers/builtin/include/ and
# ${MBEDTLS_DIR}/include/ as we still need it. Include private header files # ${MBEDTLS_DIR}/include/ as we still need it. Include private header files
# from core/ and drivers/builtin/src/. # from core/ and drivers/builtin/src/.
@ -148,6 +148,13 @@ foreach(target IN LISTS target_libraries)
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
install(
TARGETS ${target}
EXPORT TF-PSA-CryptoTargets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
endforeach(target) endforeach(target)
if(USE_STATIC_TF_PSA_CRYPTO_LIBRARY) if(USE_STATIC_TF_PSA_CRYPTO_LIBRARY)

11
tf-psa-crypto/drivers/builtin/CMakeLists.txt
View File

@ -101,7 +101,12 @@ foreach (target IN LISTS target_libraries)
endif(INSTALL_TF_PSA_CRYPTO_HEADERS) endif(INSTALL_TF_PSA_CRYPTO_HEADERS)
install(TARGETS ${target} install(TARGETS ${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)
install(TARGETS ${target}
EXPORT TF-PSA-CryptoTargets
DESTINATION ${CMAKE_INSTALL_LIBDIR}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
endforeach(target) endforeach(target)

5
tf-psa-crypto/drivers/everest/CMakeLists.txt
View File

@ -32,3 +32,8 @@ 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)
install(TARGETS ${everest_target}
EXPORT TF-PSA-CryptoTargets
DESTINATION ${CMAKE_INSTALL_LIBDIR}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)

5
tf-psa-crypto/drivers/p256-m/CMakeLists.txt
View File

@ -32,3 +32,8 @@ 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)
install(TARGETS ${p256m_target}
EXPORT TF-PSA-CryptoTargets
DESTINATION ${CMAKE_INSTALL_LIBDIR}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)