commit 466a1a29d9934a55fd293b05ac8bc0040c44a5aa
author Ronald Cron <ronald.cron@arm.com> Fri Sep 19 15:27:41 2025 +0200
committer Ronald Cron <ronald.cron@arm.com> Mon Sep 22 14:34:55 2025 +0200
tree 39b498c2e181ebbf3b92b4aff507f031a13b9d9c
parent c09a84e2852ab7343df79de054f5b4c3f5dd3481

cmake: Provide the crypto libs under their historical name

Signed-off-by: Ronald Cron <ronald.cron@arm.com>

library/CMakeLists.txt

diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 231e74e..45e6f64 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -263,6 +263,9 @@
             COMMAND ${CMAKE_COMMAND} -E copy_if_different
                     $<TARGET_FILE:${target}>
                     $<TARGET_FILE_NAME:${target}>
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                    $<TARGET_FILE:${target}>
+                    "libmbedcrypto.a"
         )
     else()
         # Copy the crypto shared library from tf-psa-crypto:
@@ -278,20 +281,38 @@
         #
         # On Windows, also copy the ".lib" file, whose full path is
         # $<TARGET_LINKER_FILE:${target}>.
-
+        #
+        # Provide also the crypto libraries under their historical names:
+        # "libmbedcrypto.*"
         add_custom_command(
             TARGET ${mbedtls_target} POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy_if_different
                     $<TARGET_FILE:${target}>
                     $<TARGET_FILE_NAME:${target}>
         )
-        if(WIN32 AND NOT CYGWIN)
+        if(APPLE)
+            add_custom_command(
+                TARGET ${mbedtls_target} POST_BUILD
+                COMMAND ${CMAKE_COMMAND} -E create_symlink
+                $<TARGET_FILE_NAME:${target}>
+                libmbedcrypto.dylib
+        )
+        elseif(WIN32 AND NOT CYGWIN)
+            add_custom_command(
+                TARGET ${mbedtls_target} POST_BUILD
+                COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                        $<TARGET_FILE:${target}>
+                        libmbedcrypto.dll
+            )
             add_custom_command(
                 TARGET ${mbedtls_target} POST_BUILD
                 COMMAND ${CMAKE_COMMAND} -E copy_if_different
                         $<TARGET_LINKER_FILE:${target}>
                         $<TARGET_LINKER_FILE_NAME:${target}>
-             )
+                COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                        $<TARGET_LINKER_FILE:${target}>
+                        libmbedcrypto.lib
+            )
         else()
             add_custom_command(
               TARGET ${mbedtls_target} POST_BUILD
@@ -301,7 +322,16 @@
               COMMAND ${CMAKE_COMMAND} -E create_symlink
                       $<TARGET_SONAME_FILE_NAME:${target}>
                       $<TARGET_LINKER_FILE_NAME:${target}>
-             )
+              COMMAND ${CMAKE_COMMAND} -E create_symlink
+                      $<TARGET_FILE_NAME:${target}>
+                      libmbedcrypto.so.${MBEDTLS_VERSION}
+              COMMAND ${CMAKE_COMMAND} -E create_symlink
+                      libmbedcrypto.so.${MBEDTLS_VERSION}
+                      libmbedcrypto.so.${MBEDTLS_CRYPTO_SOVERSION}
+              COMMAND ${CMAKE_COMMAND} -E create_symlink
+                      libmbedcrypto.so.${MBEDTLS_CRYPTO_SOVERSION}
+                      libmbedcrypto.so
+            )
         endif()
     endif()
 endforeach(target)