diff options
| author | Minos Galanakis <minos.galanakis@arm.com> | 2023-10-04 14:44:38 +0100 |
|---|---|---|
| committer | Minos Galanakis <minos.galanakis@arm.com> | 2023-10-04 16:03:22 +0100 |
| commit | 8f4c19a680acc9cbdc437006c9ef31ce51c33f49 (patch) | |
| tree | 5fb3b6d49d9d0fc135095eecc0e33efbf5d18a14 | |
| parent | 2546d7da5c95093ec3cafd2e11252a4c1d240ca8 (diff) | |
| parent | de527fbfe03f159ce19d549b3ba5c0289ee3573c (diff) | |
| download | mbedtls-8f4c19a680acc9cbdc437006c9ef31ce51c33f49.tar.gz | |
Merge pull request #8273 from davidhorstmann-arm:target-prefix-3rdparty
Add MBEDTLS_TARGET_PREFIX to 3rdparty CMake
| -rw-r--r-- | 3rdparty/everest/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | 3rdparty/p256-m/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | library/CMakeLists.txt | 19 |
3 files changed, 21 insertions, 14 deletions
diff --git a/3rdparty/everest/CMakeLists.txt b/3rdparty/everest/CMakeLists.txt index ee86f1d7b..eefc15151 100644 --- a/3rdparty/everest/CMakeLists.txt +++ b/3rdparty/everest/CMakeLists.txt @@ -1,9 +1,11 @@ -add_library(everest +set(everest_target "${MBEDTLS_TARGET_PREFIX}everest") + +add_library(${everest_target} library/everest.c library/x25519.c library/Hacl_Curve25519_joined.c) -target_include_directories(everest +target_include_directories(${everest_target} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${MBEDTLS_DIR}/include> $<INSTALL_INTERFACE:include> @@ -34,7 +36,7 @@ if(INSTALL_MBEDTLS_HEADERS) endif(INSTALL_MBEDTLS_HEADERS) -install(TARGETS everest +install(TARGETS ${everest_target} EXPORT MbedTLSTargets DESTINATION ${CMAKE_INSTALL_LIBDIR} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) diff --git a/3rdparty/p256-m/CMakeLists.txt b/3rdparty/p256-m/CMakeLists.txt index 7ff13084c..41be3c4a3 100644 --- a/3rdparty/p256-m/CMakeLists.txt +++ b/3rdparty/p256-m/CMakeLists.txt @@ -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/p256-m.c) -target_include_directories(p256m +target_include_directories(${p256m_target} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/p256-m> $<BUILD_INTERFACE:${MBEDTLS_DIR}/include> @@ -32,7 +34,7 @@ if(INSTALL_MBEDTLS_HEADERS) endif(INSTALL_MBEDTLS_HEADERS) -install(TARGETS p256m +install(TARGETS ${p256m_target} EXPORT MbedTLSTargets DESTINATION ${CMAKE_INSTALL_LIBDIR} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 84bb7857e..c3e4096af 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -268,17 +268,20 @@ if(USE_STATIC_MBEDTLS_LIBRARY AND USE_SHARED_MBEDTLS_LIBRARY) ${mbedtls_static_target}) endif() +set(p256m_target "${MBEDTLS_TARGET_PREFIX}p256m") +set(everest_target "${MBEDTLS_TARGET_PREFIX}everest") + if(USE_STATIC_MBEDTLS_LIBRARY) add_library(${mbedcrypto_static_target} STATIC ${src_crypto}) set_target_properties(${mbedcrypto_static_target} PROPERTIES OUTPUT_NAME mbedcrypto) target_link_libraries(${mbedcrypto_static_target} PUBLIC ${libs}) - if(TARGET everest) - target_link_libraries(${mbedcrypto_static_target} PUBLIC everest) + if(TARGET ${everest_target}) + target_link_libraries(${mbedcrypto_static_target} PUBLIC ${everest_target}) endif() - if(TARGET p256m) - target_link_libraries(${mbedcrypto_static_target} PUBLIC p256m) + if(TARGET ${p256m_target}) + target_link_libraries(${mbedcrypto_static_target} PUBLIC ${p256m_target}) endif() 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) target_link_libraries(${mbedcrypto_target} PUBLIC ${libs}) - if(TARGET everest) - target_link_libraries(${mbedcrypto_target} PUBLIC everest) + if(TARGET ${everest_target}) + target_link_libraries(${mbedcrypto_target} PUBLIC ${everest_target}) endif() - if(TARGET p256m) - target_link_libraries(${mbedcrypto_target} PUBLIC p256m) + if(TARGET ${p256m_target}) + target_link_libraries(${mbedcrypto_target} PUBLIC ${p256m_target}) endif() add_library(${mbedx509_target} SHARED ${src_x509}) |