| Summer Qin | ac38f3f | 2023-11-09 14:34:47 +0800 | [diff] [blame^] | 1 | From 18018c51ad67b41df6c8e1e1a49c81cc54419a88 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 |
| Summer Qin | ac38f3f | 2023-11-09 14:34:47 +0800 | [diff] [blame^] | 4 | Subject: [PATCH 3/4] 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 | --- |
| 8 | api-tests/CMakeLists.txt | 1 + |
| 9 | api-tests/val/val_spe.cmake | 4 ++++ |
| 10 | 2 files changed, 5 insertions(+) |
| 11 | |
| 12 | diff --git a/api-tests/CMakeLists.txt b/api-tests/CMakeLists.txt |
| 13 | index f5e45c1..73c9390 100644 |
| 14 | --- a/api-tests/CMakeLists.txt |
| 15 | +++ b/api-tests/CMakeLists.txt |
| 16 | @@ -673,6 +673,7 @@ add_dependencies(${PSA_TARGET_GENERATE_DATABASE_POST} ${PSA_TARGET_GENERATE_DATA |
| 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}) |
| 20 | +add_dependencies(${PSA_TARGET_TEST_COMBINE_LIB} manifest_tool) |
| 21 | if(${SUITE} STREQUAL "IPC") |
| 22 | add_dependencies(${PSA_TARGET_DRIVER_PARTITION_LIB} ${PSA_TARGET_TEST_COMBINE_LIB}) |
| 23 | add_dependencies(${PSA_TARGET_CLIENT_PARTITION_LIB} ${PSA_TARGET_DRIVER_PARTITION_LIB}) |
| 24 | diff --git a/api-tests/val/val_spe.cmake b/api-tests/val/val_spe.cmake |
| 25 | index 37b8888..4692003 100644 |
| 26 | --- a/api-tests/val/val_spe.cmake |
| 27 | +++ b/api-tests/val/val_spe.cmake |
| 28 | @@ -53,6 +53,10 @@ add_library(${PSA_TARGET_CLIENT_PARTITION_LIB} STATIC ${PARTITION_IPC_CLIENT_SRC |
| 29 | # Create Server partition library |
| 30 | add_library(${PSA_TARGET_SERVER_PARTITION_LIB} STATIC ${PARTITION_IPC_SERVER_SRC_C_SPE} ${SUITE_SERVER_CC_SRC_SPE}) |
| 31 | |
| 32 | +add_dependencies(${PSA_TARGET_DRIVER_PARTITION_LIB} manifest_tool) |
| 33 | +add_dependencies(${PSA_TARGET_CLIENT_PARTITION_LIB} manifest_tool) |
| 34 | +add_dependencies(${PSA_TARGET_SERVER_PARTITION_LIB} manifest_tool) |
| 35 | + |
| 36 | target_include_directories(${PSA_TARGET_DRIVER_PARTITION_LIB} PRIVATE |
| 37 | ${CMAKE_CURRENT_BINARY_DIR} |
| 38 | ${PSA_ROOT_DIR}/val/common |
| 39 | -- |
| 40 | 2.25.1 |
| 41 | |