Antonio de Angelis | 75024f0 | 2024-11-02 22:46:23 +0000 | [diff] [blame] | 1 | From e8150b5c013d01a3ee268e50cd4f83ea86ff7c5b Mon Sep 17 00:00:00 2001 |
Kevin Peng | 6eb4418 | 2023-11-09 14:42:46 +0800 | [diff] [blame] | 2 | From: Kevin Peng <kevin.peng@arm.com> |
| 3 | Date: Thu, 9 Nov 2023 14:40:48 +0800 |
Antonio de Angelis | 75024f0 | 2024-11-02 22:46:23 +0000 | [diff] [blame] | 4 | Subject: [PATCH 3/5] Build: Add manifest tool dependencies |
Kevin Peng | 6eb4418 | 2023-11-09 14:42:46 +0800 | [diff] [blame] | 5 | |
| 6 | Signed-off-by: Kevin Peng <kevin.peng@arm.com> |
| 7 | --- |
Kevin Peng | 31935c8 | 2023-11-09 16:20:27 +0800 | [diff] [blame] | 8 | api-tests/CMakeLists.txt | 3 +++ |
| 9 | api-tests/val/val_spe.cmake | 6 ++++++ |
| 10 | 2 files changed, 9 insertions(+) |
Kevin Peng | 6eb4418 | 2023-11-09 14:42:46 +0800 | [diff] [blame] | 11 | |
| 12 | diff --git a/api-tests/CMakeLists.txt b/api-tests/CMakeLists.txt |
Kevin Peng | 31935c8 | 2023-11-09 16:20:27 +0800 | [diff] [blame] | 13 | index f5e45c1..176978e 100644 |
Kevin Peng | 6eb4418 | 2023-11-09 14:42:46 +0800 | [diff] [blame] | 14 | --- a/api-tests/CMakeLists.txt |
| 15 | +++ b/api-tests/CMakeLists.txt |
Kevin Peng | 31935c8 | 2023-11-09 16:20:27 +0800 | [diff] [blame] | 16 | @@ -673,6 +673,9 @@ add_dependencies(${PSA_TARGET_GENERATE_DATABASE_POST} ${PSA_TARGET_GENERATE_DATA |
Kevin Peng | 6eb4418 | 2023-11-09 14:42:46 +0800 | [diff] [blame] | 17 | add_dependencies(${PSA_TARGET_PAL_NSPE_LIB} ${PSA_TARGET_GENERATE_DATABASE_POST}) |
| 18 | add_dependencies(${PSA_TARGET_VAL_NSPE_LIB} ${PSA_TARGET_PAL_NSPE_LIB}) |
| 19 | add_dependencies(${PSA_TARGET_TEST_COMBINE_LIB} ${PSA_TARGET_VAL_NSPE_LIB}) |
Kevin Peng | 31935c8 | 2023-11-09 16:20:27 +0800 | [diff] [blame] | 20 | +if(TARGET manifest_tool) |
| 21 | + add_dependencies(${PSA_TARGET_TEST_COMBINE_LIB} manifest_tool) |
| 22 | +endif() |
Kevin Peng | 6eb4418 | 2023-11-09 14:42:46 +0800 | [diff] [blame] | 23 | if(${SUITE} STREQUAL "IPC") |
| 24 | add_dependencies(${PSA_TARGET_DRIVER_PARTITION_LIB} ${PSA_TARGET_TEST_COMBINE_LIB}) |
| 25 | add_dependencies(${PSA_TARGET_CLIENT_PARTITION_LIB} ${PSA_TARGET_DRIVER_PARTITION_LIB}) |
| 26 | diff --git a/api-tests/val/val_spe.cmake b/api-tests/val/val_spe.cmake |
Kevin Peng | 31935c8 | 2023-11-09 16:20:27 +0800 | [diff] [blame] | 27 | index 37b8888..81f8d6a 100644 |
Kevin Peng | 6eb4418 | 2023-11-09 14:42:46 +0800 | [diff] [blame] | 28 | --- a/api-tests/val/val_spe.cmake |
| 29 | +++ b/api-tests/val/val_spe.cmake |
Kevin Peng | 31935c8 | 2023-11-09 16:20:27 +0800 | [diff] [blame] | 30 | @@ -53,6 +53,12 @@ add_library(${PSA_TARGET_CLIENT_PARTITION_LIB} STATIC ${PARTITION_IPC_CLIENT_SRC |
Kevin Peng | 6eb4418 | 2023-11-09 14:42:46 +0800 | [diff] [blame] | 31 | # Create Server partition library |
| 32 | add_library(${PSA_TARGET_SERVER_PARTITION_LIB} STATIC ${PARTITION_IPC_SERVER_SRC_C_SPE} ${SUITE_SERVER_CC_SRC_SPE}) |
| 33 | |
Kevin Peng | 31935c8 | 2023-11-09 16:20:27 +0800 | [diff] [blame] | 34 | +if(TARGET manifest_tool) |
| 35 | + add_dependencies(${PSA_TARGET_DRIVER_PARTITION_LIB} manifest_tool) |
| 36 | + add_dependencies(${PSA_TARGET_CLIENT_PARTITION_LIB} manifest_tool) |
| 37 | + add_dependencies(${PSA_TARGET_SERVER_PARTITION_LIB} manifest_tool) |
| 38 | +endif() |
Kevin Peng | 6eb4418 | 2023-11-09 14:42:46 +0800 | [diff] [blame] | 39 | + |
| 40 | target_include_directories(${PSA_TARGET_DRIVER_PARTITION_LIB} PRIVATE |
| 41 | ${CMAKE_CURRENT_BINARY_DIR} |
| 42 | ${PSA_ROOT_DIR}/val/common |
| 43 | -- |
Antonio de Angelis | 75024f0 | 2024-11-02 22:46:23 +0000 | [diff] [blame] | 44 | 2.47.0 |
Kevin Peng | 6eb4418 | 2023-11-09 14:42:46 +0800 | [diff] [blame] | 45 | |