mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-03-16 04:20:49 +00:00
Rename export MbedTLSTargets to TF-PSA-CryptoTargets
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:
parent
2609fe9155
commit
ba850f3207
@ -454,12 +454,12 @@ if(NOT DISABLE_PACKAGE_CONFIG_AND_INSTALL)
|
||||
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/TF-PSA-Crypto")
|
||||
|
||||
export(
|
||||
EXPORT MbedTLSTargets
|
||||
EXPORT TF-PSA-CryptoTargets
|
||||
NAMESPACE TF-PSA-Crypto::
|
||||
FILE "cmake/TF-PSA-CryptoTargets.cmake")
|
||||
|
||||
install(
|
||||
EXPORT MbedTLSTargets
|
||||
EXPORT TF-PSA-CryptoTargets
|
||||
NAMESPACE TF-PSA-Crypto::
|
||||
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/TF-PSA-Crypto"
|
||||
FILE "TF-PSA-CryptoTargets.cmake")
|
||||
|
@ -127,7 +127,7 @@ if(USE_SHARED_TF_PSA_CRYPTO_LIBRARY)
|
||||
endif(USE_SHARED_TF_PSA_CRYPTO_LIBRARY)
|
||||
|
||||
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
|
||||
# ${MBEDTLS_DIR}/include/ as we still need it. Include private header files
|
||||
# from core/ and drivers/builtin/src/.
|
||||
@ -148,6 +148,13 @@ foreach(target IN LISTS target_libraries)
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
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)
|
||||
|
||||
if(USE_STATIC_TF_PSA_CRYPTO_LIBRARY)
|
||||
|
@ -101,7 +101,12 @@ foreach (target IN LISTS target_libraries)
|
||||
endif(INSTALL_TF_PSA_CRYPTO_HEADERS)
|
||||
|
||||
install(TARGETS ${target}
|
||||
EXPORT MbedTLSTargets
|
||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
|
||||
EXPORT MbedTLSTargets
|
||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
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)
|
||||
|
@ -32,3 +32,8 @@ install(TARGETS ${everest_target}
|
||||
EXPORT MbedTLSTargets
|
||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
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)
|
||||
|
@ -32,3 +32,8 @@ install(TARGETS ${p256m_target}
|
||||
EXPORT MbedTLSTargets
|
||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user