diff options
| author | Ronald Cron <ronald.cron@arm.com> | 2024-07-10 14:02:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-10 14:02:42 +0000 |
| commit | 1004c9cacb56c20da57cfbc8ab196e5d8bbeb4a7 (patch) | |
| tree | ebeb179cc382a4c395958babd1b5c3c32b37610e /CMakeLists.txt | |
| parent | fe3ad99af36eedbfe45b26c4332bff4ce5fdf1b0 (diff) | |
| parent | 1992c9122fca78dc3c6e282c52d1b1f2019eb9af (diff) | |
| download | mbedtls-development.zip mbedtls-development.tar.gz mbedtls-development.tar.bz2 | |
Merge pull request #9340 from ronald-cron-arm/move-mbedtls-crypto-modulesHEADdevelopmentcoverity_scan
Move mbedtls crypto modules
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 28d4b83..e1bfbb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -294,12 +294,10 @@ add_subdirectory(framework) add_subdirectory(include) -add_subdirectory(3rdparty) +add_subdirectory(tf-psa-crypto) add_subdirectory(library) -add_subdirectory(tf-psa-crypto) - add_subdirectory(pkgconfig) # @@ -357,7 +355,9 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/include PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/drivers/builtin/include - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/library) + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/library + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/core + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/drivers/builtin/src) # Request C11, needed for memory poisoning tests set_target_properties(mbedtls_test PROPERTIES C_STANDARD 11) @@ -370,7 +370,9 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/include PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/drivers/builtin/include PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/library - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/everest/include) + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/core + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/drivers/builtin/src + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/drivers/everest/include) # Pass-through MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE if(MBEDTLS_CONFIG_FILE) |